Merge lp:~indicator-applet-developers/libindicate/ubuntu into lp:~ubuntu-desktop/libindicate/ubuntu

[Ted Gould]

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2009-08-07 15:06:32 +0000
+++ .bzrignore	2009-09-03 21:57:34 +0000
@@ -103,3 +103,47 @@
 data/GNOME_IndicatorAppletSUS.server
 data/GNOME_IndicatorAppletSUS.server.in
 src-sus/indicator-applet-no-sus
+docs/reference/libindicate-decl-list.txt.bak
+docs/reference/libindicate-decl.txt.bak
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+gnome-doc-utils.make
+install-sh
+libtool
+ltmain.sh
+missing
+omf.make
+stamp-h1
+xmldocs.make
+docs/Makefile
+docs/Makefile.in
+docs/reference/Makefile
+docs/reference/Makefile.in
+examples/Makefile
+examples/Makefile.in
+libindicate/Makefile
+libindicate/Makefile.in
+libindicate/indicate-0.2.pc
+libindicate-gtk/Makefile
+libindicate-gtk/Makefile.in
+libindicate-gtk/indicate-gtk-0.2.pc
+tests/Makefile
+tests/Makefile.in
+tests/test-max-indicators-client
+tests/test-max-indicators-server
+tests/test-max-indicators-server-repeat
+tests/test-indicator-display-client
+tests/test-indicator-display-server
+tests/test-indicator-display-half-server
+tests/test-indicator-display-half-client
 
=== modified file 'configure.ac'
--- configure.ac	2009-08-18 18:10:11 +0000
+++ configure.ac	2009-09-03 22:33:32 +0000
@@ -1,10 +1,10 @@
 
-AC_INIT(libindicate, 0.2.0dev, [e-mail])
+AC_INIT(libindicate, 0.2.0, [e-mail])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicate, 0.2.0dev)
+AM_INIT_AUTOMAKE(libindicate, 0.2.0)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -18,11 +18,13 @@
 AC_SUBST(VERSION)
 AC_CONFIG_MACRO_DIR([m4])
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 ###########################
 # Libindicate versioning 
 ###########################
 
-LIBINDICATE_CURRENT=2
+LIBINDICATE_CURRENT=3
 LIBINDICATE_REVISION=0
 LIBINDICATE_AGE=0
 
@@ -34,7 +36,7 @@
 # Libindicate versioning 
 ###########################
 
-LIBINDICATEGTK_CURRENT=0
+LIBINDICATEGTK_CURRENT=1
 LIBINDICATEGTK_REVISION=0
 LIBINDICATEGTK_AGE=0
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-08-25 06:30:03 +0000
+++ debian/changelog	2009-09-09 13:42:06 +0000
@@ -1,3 +1,47 @@
+libindicate (0.2.0-0ubuntu1~ppa6) karmic; urgency=low
+
+  * Merge from the extra funcs branch
+    * Big change is renaming some signal names. :(
+    * Bug fixes in getting properties.
+    * Removing looking at the type on indicator lists.
+    * Fixing the count callback.
+
+ -- Ted Gould <[e-mail]>  Wed, 09 Sep 2009 08:42:01 -0500
+
+libindicate (0.2.0-0ubuntu1~ppa5) karmic; urgency=low
+
+  * Merging with ~ubuntu-desktop
+
+ -- Ted Gould <[e-mail]>  Fri, 04 Sep 2009 14:08:34 -0500
+
+libindicate (0.2.0-0ubuntu1~ppa4) karmic; urgency=low
+
+  * Merging things onto a trunk branch.
+
+ -- Ted Gould <[e-mail]>  Fri, 04 Sep 2009 14:04:30 -0500
+
+libindicate (0.2.0-0ubuntu1~ppa3) karmic; urgency=low
+
+  * Adding back indicator-messages.h for some defines.
+
+ -- Ted Gould <[e-mail]>  Fri, 04 Sep 2009 12:47:52 -0500
+
+libindicate (0.2.0-0ubuntu1~ppa2) karmic; urgency=low
+
+  * 64-bit build fixes.
+
+ -- Ted Gould <[e-mail]>  Thu, 03 Sep 2009 22:01:57 -0500
+
+libindicate (0.2.0-0ubuntu1~ppa1) karmic; urgency=low
+
+  * Upstream merge
+  * debian/control: Increasing library versions to libindicate3
+    and libindicate-gtk1.  Moving .install files as well.
+  * libindicate-dev and libindicate-gtk-dev.install change to
+    /usr/include/libindicate-0.2 from 0.1
+
+ -- Ted Gould <[e-mail]>  Thu, 03 Sep 2009 17:34:56 -0500
+
 libindicate (0.2.0~bzr325-0ubuntu1) karmic; urgency=low
 
   [ Ken VanDine ]
@@ -8,10 +52,5 @@
   * Setting the icon path in the .pc file.
   * debian/control:
     - Set both Vcs-Bzr and Vcs-Bzr-Browser
-    - Changed branch to ~ubuntu-desktop
-
-  [ Martin Pitt ]
-  * Flush changelog, the packaging changed pretty much completely.
-  * Fix Vcs-* links.
-
- -- Ken VanDine <[e-mail]>  Tue, 25 Aug 2009 08:29:59 +0200
+
+ -- Ted Gould <[e-mail]>  Thu, 03 Sep 2009 17:16:51 -0500
 
=== modified file 'debian/control'
--- debian/control	2009-08-25 06:23:53 +0000
+++ debian/control	2009-09-04 19:08:30 +0000
@@ -16,7 +16,7 @@
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicate/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicate/ubuntu
 
-Package: libindicate2
+Package: libindicate3
 Section: libs
 Conflicts: libindicate
 Replaces: libindicate
@@ -34,7 +34,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicate2 (= ${binary:Version}),
+         libindicate3 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76)
 Description: GNOME panel indicator applet - shared library
  indicator-applet is an applet to display information from
@@ -42,7 +42,7 @@
  .
  This package contains files that are needed to build applications.
 
-Package: libindicate-gtk0
+Package: libindicate-gtk1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -58,7 +58,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicate-gtk0 (= ${binary:Version}),
+         libindicate-gtk1 (= ${binary:Version}),
          libindicate-dev (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
@@ -73,8 +73,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicate2 (= ${binary:Version}),
-         libindicate-gtk0 (= ${binary:Version}),
+         libindicate3 (= ${binary:Version}),
+         libindicate-gtk1 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
 Description: GNOME panel indicator applet - shared library
 
=== modified file 'debian/libindicate-dev.install'
--- debian/libindicate-dev.install	2009-08-03 23:32:09 +0000
+++ debian/libindicate-dev.install	2009-09-03 22:27:49 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libindicate-0.1/libindicate/*
+debian/tmp/usr/include/libindicate-0.2/libindicate/*
 debian/tmp/usr/lib/pkgconfig/indicate.pc
 debian/tmp/usr/lib/libindicate.a
 debian/tmp/usr/lib/libindicate.so
 
=== modified file 'debian/libindicate-gtk-dev.install'
--- debian/libindicate-gtk-dev.install	2009-08-03 23:32:09 +0000
+++ debian/libindicate-gtk-dev.install	2009-09-03 22:27:49 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libindicate-0.1/libindicate-gtk/*
+debian/tmp/usr/include/libindicate-0.2/libindicate-gtk/*
 debian/tmp/usr/lib/pkgconfig/indicate-gtk.pc
 debian/tmp/usr/lib/libindicate-gtk.a
 debian/tmp/usr/lib/libindicate-gtk.so
 
=== renamed file 'debian/libindicate-gtk0.install' => 'debian/libindicate-gtk1.install'
=== renamed file 'debian/libindicate2.install' => 'debian/libindicate3.install'
=== modified file 'docs/reference/libindicate-sections.txt'
--- docs/reference/libindicate-sections.txt	2009-05-01 03:30:04 +0000
+++ docs/reference/libindicate-sections.txt	2009-08-31 20:06:58 +0000
@@ -6,38 +6,24 @@
 IndicateIndicator
 IndicateIndicatorClass
 indicate_indicator_get_id
-indicate_indicator_get_indicator_type
 indicate_indicator_get_property
 indicate_indicator_hide
 indicate_indicator_is_visible
 indicate_indicator_list_properties
 indicate_indicator_new
 indicate_indicator_set_property
-indicate_indicator_set_property_icon
 indicate_indicator_set_property_time
 indicate_indicator_show
 indicate_indicator_user_display
 </SECTION>
 
 <SECTION>
-<FILE>indicator-message</FILE>
-<TITLE>IndicateIndicatorMessage</TITLE>
-IndicateIndicatorMessage
-IndicateIndicatorMessageClass
-indicate_indicator_message_new
-</SECTION>
-
-<SECTION>
 <FILE>server</FILE>
 <TITLE>IndicateServer</TITLE>
 IndicateServer
 IndicateServerClass
 indicate_server_add_indicator
 indicate_server_check_interest
-indicate_server_emit_indicator_added
-indicate_server_emit_indicator_modified
-indicate_server_emit_indicator_removed
-indicate_server_emit_server_display
 indicate_server_get_next_id
 indicate_server_hide
 indicate_server_ref_default
 
=== modified file 'docs/reference/libindicate.types'
--- docs/reference/libindicate.types	2009-02-03 13:56:35 +0000
+++ docs/reference/libindicate.types	2009-08-28 20:58:09 +0000
@@ -1,9 +1,7 @@
 #include <libindicate/indicator.h>
-#include <libindicate/indicator-message.h>
 #include <libindicate/server.h>
 #include <libindicate/listener.h>
 
 indicate_indicator_get_type
-indicate_indicator_message_get_type
 indicate_server_get_type
 indicate_listener_get_type
 
=== modified file 'docs/reference/tmpl/libindicate-unused.sgml'
--- docs/reference/tmpl/libindicate-unused.sgml	2009-08-04 11:30:59 +0000
+++ docs/reference/tmpl/libindicate-unused.sgml	2009-09-08 22:03:55 +0000
@@ -1,377 +1,73 @@
-<!-- ##### MACRO INDICATE_INDICATOR ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_INDICATOR_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### MACRO INDICATE_INDICATOR_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_INDICATOR_MESSAGE ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-<!-- ##### MACRO INDICATE_INDICATOR_MESSAGE_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### MACRO INDICATE_INDICATOR_MESSAGE_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-<!-- ##### MACRO INDICATE_INDICATOR_SIGNAL_DISPLAY ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_INDICATOR_SIGNAL_HIDE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_INDICATOR_SIGNAL_MODIFIED ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_INDICATOR_SIGNAL_SHOW ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_IS_INDICATOR ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_IS_INDICATOR_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### MACRO INDICATE_IS_INDICATOR_MESSAGE ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-<!-- ##### MACRO INDICATE_IS_INDICATOR_MESSAGE_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### MACRO INDICATE_IS_LISTENER ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_IS_LISTENER_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### MACRO INDICATE_IS_SERVER ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_IS_SERVER_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### MACRO INDICATE_LISTENER ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_LISTENER_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### MACRO INDICATE_LISTENER_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_LISTENER_INDICATOR_ID ##### -->
+<!-- ##### SECTION ./tmpl/indicator-message.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/indicator-message.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/indicator-message.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/indicator-message.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/indicator-message.sgml:Title ##### -->
+IndicateIndicatorMessage
+
+
+<!-- ##### STRUCT IndicateIndicatorMessage ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT IndicateIndicatorMessageClass ##### -->
+<para>
+
+</para>
+
+@parent_class: 
+
+<!-- ##### SIGNAL IndicateServer::indicator-added ##### -->
+<para>
+
+</para>
+
+@indicateserver: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL IndicateServer::indicator-not-shown ##### -->
+<para>
+
+</para>
+
+@indicateserver: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL IndicateServer::indicator-removed ##### -->
+<para>
+
+</para>
+
+@indicateserver: the object which received the signal.
+@arg1: 
+
+<!-- ##### FUNCTION indicate_indicator_get_indicator_type ##### -->
 <para>
 
 </para>
 
 @indicator: 
-
-<!-- ##### MACRO INDICATE_LISTENER_SERVER_DBUS_NAME ##### -->
-<para>
-
-</para>
-
-@server: 
-
-<!-- ##### MACRO INDICATE_LISTENER_SIGNAL_INDICATOR_ADDED ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_LISTENER_SIGNAL_INDICATOR_REMOVED ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_LISTENER_SIGNAL_SERVER_ADDED ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_LISTENER_SIGNAL_SERVER_REMOVED ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_SERVER ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_SERVER_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### MACRO INDICATE_SERVER_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### MACRO INDICATE_TYPE_INDICATOR ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_TYPE_INDICATOR_MESSAGE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_TYPE_LISTENER ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO INDICATE_TYPE_SERVER ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### -->
-<para>
-
-</para>
-
-@Param1: 
-@Returns: 
-
-<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_char ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_double ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_float ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_int ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_long ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_object ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_param ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_string ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
-<para>
-
-</para>
-
-@v: 
-
-<!-- ##### FUNCTION indicate_indicator_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION indicate_indicator_message_get_type ##### -->
+@Returns: 
+
+<!-- ##### FUNCTION indicate_indicator_message_new ##### -->
 <para>
 
 </para>
@@ -387,19 +83,39 @@
 @key: 
 @data: 
 
-<!-- ##### FUNCTION indicate_listener_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION indicate_server_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
+<!-- ##### FUNCTION indicate_server_emit_indicator_added ##### -->
+<para>
+
+</para>
+
+@server: 
+@id: 
+@type: 
+
+<!-- ##### FUNCTION indicate_server_emit_indicator_modified ##### -->
+<para>
+
+</para>
+
+@server: 
+@id: 
+@property: 
+
+<!-- ##### FUNCTION indicate_server_emit_indicator_removed ##### -->
+<para>
+
+</para>
+
+@server: 
+@id: 
+@type: 
+
+<!-- ##### FUNCTION indicate_server_emit_server_display ##### -->
+<para>
+
+</para>
+
+@server: 
 
 <!-- ##### FUNCTION indicate_server_new ##### -->
 <para>
@@ -415,241 +131,3 @@
 
 @obj: 
 
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_count ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_indicator_count: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_count_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@callback: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_count_by_type ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_type: 
-@OUT_indicator_count: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_count_by_type_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_type: 
-@callback: 
-@Returns: 
-
-<!-- ##### USER_FUNCTION org_freedesktop_indicator_get_indicator_count_by_type_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_indicator_count: 
-@error: 
-@userdata: 
-
-<!-- ##### USER_FUNCTION org_freedesktop_indicator_get_indicator_count_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_indicator_count: 
-@error: 
-@userdata: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_list ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_indicators: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_list_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@callback: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_list_by_type ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_type: 
-@OUT_indicators: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_list_by_type_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_type: 
-@callback: 
-@Returns: 
-
-<!-- ##### USER_FUNCTION org_freedesktop_indicator_get_indicator_list_by_type_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_indicators: 
-@error: 
-@userdata: 
-
-<!-- ##### USER_FUNCTION org_freedesktop_indicator_get_indicator_list_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_indicators: 
-@error: 
-@userdata: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_properties ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@OUT_properties: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_properties_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@callback: 
-@Returns: 
-
-<!-- ##### USER_FUNCTION org_freedesktop_indicator_get_indicator_properties_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_properties: 
-@error: 
-@userdata: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_property ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_property: 
-@OUT_value: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_property_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_property: 
-@callback: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_property_group ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_properties: 
-@OUT_values: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_get_indicator_property_group_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@IN_properties: 
-@callback: 
-@Returns: 
-
-<!-- ##### USER_FUNCTION org_freedesktop_indicator_get_indicator_property_group_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_values: 
-@error: 
-@userdata: 
-
-<!-- ##### USER_FUNCTION org_freedesktop_indicator_get_indicator_property_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@OUT_value: 
-@error: 
-@userdata: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_show_indicator_to_user ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@Returns: 
-
-<!-- ##### FUNCTION org_freedesktop_indicator_show_indicator_to_user_async ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@IN_id: 
-@callback: 
-@Returns: 
-
-<!-- ##### USER_FUNCTION org_freedesktop_indicator_show_indicator_to_user_reply ##### -->
-<para>
-
-</para>
-
-@proxy: 
-@error: 
-@userdata: 
-
 
=== modified file 'examples/im-client.c'
--- examples/im-client.c	2009-08-03 22:49:42 +0000
+++ examples/im-client.c	2009-08-28 19:40:56 +0000
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include "libindicate/server.h"
-#include "libindicate/indicator-message.h"
+#include "libindicate/indicator.h"
 #include "libindicate-gtk/indicator.h"
 
 gchar * patha = "/usr/share/icons/hicolor/16x16/apps/empathy.png";
@@ -69,7 +69,7 @@
 static void
 interest_added (IndicateServer * server, IndicateInterests interest)
 {
-	g_debug("Oh, someone is interested in my for: %d", interest);
+	g_debug("Oh, someone is interested in me for: %d", interest);
 }
 
 void
@@ -90,9 +90,9 @@
 	g_signal_connect(G_OBJECT(server), INDICATE_SERVER_SIGNAL_INTEREST_ADDED, G_CALLBACK(interest_added), NULL);
 	g_signal_connect(G_OBJECT(server), INDICATE_SERVER_SIGNAL_INTEREST_REMOVED, G_CALLBACK(interest_removed), NULL);
 
-	IndicateIndicatorMessage * indicator;
+	IndicateIndicator * indicator;
 
-	indicator = indicate_indicator_message_new();
+	indicator = indicate_indicator_new();
 	indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "subtype", "im");
 	indicate_indicator_set_property(INDICATE_INDICATOR(indicator), "sender", "IM Client Test");
 	GTimeVal time; g_get_current_time(&time);
 
=== modified file 'examples/show-hide-server.c'
--- examples/show-hide-server.c	2009-04-07 22:34:45 +0000
+++ examples/show-hide-server.c	2009-08-28 19:40:56 +0000
@@ -2,7 +2,6 @@
 
 #include <glib.h>
 #include "libindicate/server.h"
-#include "libindicate/indicator-message.h"
 
 gboolean hidden = TRUE;
 
@@ -12,14 +11,14 @@
     IndicateServer * server = INDICATE_SERVER(data);
 
 	if (hidden) {
-        printf("showing... ");
+        g_debug("showing... ");
         indicate_server_show(server);
-        printf("ok\n");
+        g_debug("ok\n");
         hidden = FALSE;
 	} else {
-        printf("hiding... ");
+        g_debug("hiding... ");
         indicate_server_hide(server);
-        printf("ok\n");
+        g_debug("ok\n");
         hidden = TRUE;
 	}
 
 
=== modified file 'libindicate-gtk/Makefile.am'
--- libindicate-gtk/Makefile.am	2009-08-04 00:26:10 +0000
+++ libindicate-gtk/Makefile.am	2009-09-03 22:32:17 +0000
@@ -8,7 +8,7 @@
 lib_LTLIBRARIES = \
 	libindicate-gtk.la
 
-libindicate_gtkincludedir=$(includedir)/libindicate-0.1/libindicate-gtk
+libindicate_gtkincludedir=$(includedir)/libindicate-0.2/libindicate-gtk
 
 indicate_gtk_headers = \
 	indicator.h \
 
=== modified file 'libindicate-gtk/indicate-gtk.pc.in'
--- libindicate-gtk/indicate-gtk.pc.in	2009-08-03 18:10:34 +0000
+++ libindicate-gtk/indicate-gtk.pc.in	2009-09-03 22:32:17 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libindicate-0.1
+Cflags: -I${includedir}/libindicate-0.2
 Requires: gtk+-2.0 indicate
 Libs: -L${libdir} -lindicate-gtk
 
 
=== modified file 'libindicate-gtk/indicator.c'
--- libindicate-gtk/indicator.c	2009-08-03 18:25:05 +0000
+++ libindicate-gtk/indicator.c	2009-09-04 03:00:22 +0000
@@ -54,7 +54,7 @@
 
 	if (!gdk_pixbuf_save_to_buffer((GdkPixbuf *)data, &png_data, &png_data_len, "png", &error, NULL)) {
 		if (error == NULL) {
-			g_warning("Unable to create pixbuf data stream: %d", png_data_len);
+			g_warning("Unable to create pixbuf data stream: %d", (gint)png_data_len);
 		} else {
 			g_warning("Unable to create pixbuf data stream: %s", error->message);
 			g_error_free(error);
 
=== modified file 'libindicate-gtk/listener.c'
--- libindicate-gtk/listener.c	2009-08-03 22:43:37 +0000
+++ libindicate-gtk/listener.c	2009-09-08 20:59:59 +0000
@@ -127,7 +127,7 @@
 {
 	/* g_debug("get_property_helper: %s %d", property, prop_type); */
 	/* TODO: Do we need to somehow refcount the server/indicator while we're waiting on this? */
-	get_property_t * get_property_data = g_new(get_property_t, 1);
+	get_property_t * get_property_data = g_new0(get_property_t, 1);
 	get_property_data->cb = callback;
 	get_property_data->data = data;
 	get_property_data->listener = listener;
 
=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am	2009-08-03 22:31:00 +0000
+++ libindicate/Makefile.am	2009-09-04 17:44:23 +0000
@@ -27,11 +27,11 @@
 lib_LTLIBRARIES = \
 	libindicate.la
 
-libindicateincludedir=$(includedir)/libindicate-0.1/libindicate
+libindicateincludedir=$(includedir)/libindicate-0.2/libindicate
 
 indicate_headers = \
 	indicator.h \
-	indicator-message.h \
+	indicator-messages.h \
 	listener.h \
 	server.h \
 	interests.h \
@@ -55,7 +55,6 @@
 	listener-marshal.h \
 	listener-private.h \
 	indicator.c \
-	indicator-message.c \
 	interests-priv.h
 
 libindicate_la_LDFLAGS = \
@@ -64,7 +63,8 @@
 	-export-symbols-regex "^[^_d].*"
 
 libindicate_la_CFLAGS = \
-	$(LIBINDICATE_CFLAGS)
+	$(LIBINDICATE_CFLAGS) \
+	-Wall -Werror
 
 libindicate_la_LIBADD = \
 	$(LIBINDICATE_LIBS)
@@ -148,40 +148,39 @@
 	&& echo timestamp > $(@F)
 
 CLEANFILES = \
-	$(ENUM_FILE).c \
-	$(ENUM_FILE).h \
+	$(BUILT_SOURCES) \
 	s-enum-types-c \
 	s-enum-types-h
 
 if USE_GIR
 
 gobjectintrospection_gir_DATA = \
-	Indicate-0.1.gir
+	Indicate-0.2.gir
 gobjectintrospection_girdir = $(datadir)/gir
 
 gobjectintrospection_type_DATA = \
-	Indicate-0.1.typelib
+	Indicate-0.2.typelib
 gobjectintrospection_typedir = $(libdir)/girepository
 
 irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers))
-Indicate-0.1.gir: $(irscanner_headers)
+Indicate-0.2.gir: $(irscanner_headers) Makefile
 	$(G_IR_SCANNER) \
 		-v --namespace Indicate \
-		--nsversion=0.1 \
+		--nsversion=0.2 \
 		--add-include-path=$(srcdir) \
 		--include=GObject-2.0 \
 		--include=GLib-2.0 \
 		--include=GdkPixbuf-2.0 \
 		--library=indicate --pkg indicate \
-		--output Indicate-0.1.gir $(irscanner_headers)
+		--output Indicate-0.2.gir $(irscanner_headers)
 
-Indicate-0.1.typelib: Indicate-0.1.gir
+Indicate-0.2.typelib: Indicate-0.2.gir
 	$(G_IR_COMPILER) \
-		--includedir=$(srcdir) Indicate-0.1.gir \
-		-o Indicate-0.1.typelib
+		--includedir=$(srcdir) Indicate-0.2.gir \
+		-o Indicate-0.2.typelib
 
 DISTCLEANFILES = \
-	Indicate-0.1.gir \
-	Indicate-0.1.typelib
+	Indicate-0.2.gir \
+	Indicate-0.2.typelib
 
 endif
 
=== modified file 'libindicate/indicate-interface.xml'
--- libindicate/indicate-interface.xml	2009-04-02 15:49:35 +0000
+++ libindicate/indicate-interface.xml	2009-09-08 21:56:49 +0000
@@ -31,24 +31,17 @@
 	<interface name="org.freedesktop.indicator">
 
 <!-- Properties -->
-		<property name="desktop" type="s" access="read"/>
-		<property name="type" type="s" access="read"/>
+		<property name="desktop" type="s" access="read" />
+		<property name="type"    type="s" access="read" />
+		<property name="count"   type="u" access="read" />
 
 <!-- Functions -->
 		<method name="GetIndicatorCount">
 			<arg type="u" name="indicator_count" direction="out" />
 		</method>
-		<method name="GetIndicatorCountByType">
-			<arg type="s" name="type" direction="in" />
-			<arg type="u" name="indicator_count" direction="out" />
-		</method>
 		<method name="GetIndicatorList">
 			<arg type="ai" name="indicators" direction="out" />
 		</method>
-		<method name="GetIndicatorListByType">
-			<arg type="s" name="type" direction="in" />
-			<arg type="ai" name="indicators" direction="out" />
-		</method>
 		<method name="GetIndicatorProperty">
 			<arg type="u" name="id" direction="in" />
 			<arg type="s" name="property" direction="in" />
@@ -66,6 +59,11 @@
 		<method name="ShowIndicatorToUser">
 			<arg type="u" name="id" direction="in" />
 		</method>
+		<method name="IndicatorDisplayed">
+			<annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
+			<arg type="u" name="id" direction="in" />
+			<arg type="b" name="displayed" direction="in" />
+		</method>
 		<method name="ShowInterest">
 			<annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
 			<arg type="s" name="interest" direction="in" />
@@ -74,16 +72,18 @@
 			<annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
 			<arg type="s" name="interest" direction="in" />
 		</method>
+		<method name="SetMaxIndicators">
+			<annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
+			<arg type="i" name="max" direction="in" />
+		</method>
 
 
 <!-- Signals -->
-		<signal name="IndicatorAdded">
+		<signal name="IndicatorNew">
 			<arg type="u" name="id" direction="out" />
-			<arg type="s" name="type" direction="out" />
 		</signal>
-		<signal name="IndicatorRemoved">
+		<signal name="IndicatorDelete">
 			<arg type="u" name="id" direction="out" />
-			<arg type="s" name="type" direction="out" />
 		</signal>
 		<signal name="IndicatorModified">
 			<arg type="u" name="id" direction="out" />
@@ -95,6 +95,9 @@
 		<signal name="ServerHide">
 			<arg type="s" name="type" direction="out" />
 		</signal>
+		<signal name="ServerCountChanged">
+			<arg type="u" name="count" direction="out" />
+		</signal>
 
 
 <!-- End of interesting stuff -->
 
=== modified file 'libindicate/indicate.pc.in'
--- libindicate/indicate.pc.in	2009-08-04 11:25:24 +0000
+++ libindicate/indicate.pc.in	2009-09-03 22:32:17 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libindicate-0.1
+Cflags: -I${includedir}/libindicate-0.2
 Requires: gobject-2.0 glib-2.0 dbus-glib-1
 Libs: -L${libdir} -lindicate
 
 
=== removed file 'libindicate/indicator-message.c'
--- libindicate/indicator-message.c	2009-04-30 21:57:51 +0000
+++ libindicate/indicator-message.c	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-/*
-A library to allow applictions to provide simple indications of
-information to be displayed to users of the application through the
-interface shell.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of either or both of the following licenses:
-
-1) the GNU Lesser General Public License version 3, as published by the 
-Free Software Foundation; and/or
-2) the GNU Lesser General Public License version 2.1, as published by 
-the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the applicable version of the GNU Lesser General Public 
-License for more details.
-
-You should have received a copy of both the GNU Lesser General Public 
-License version 3 and version 2.1 along with this program.  If not, see 
-<http://www.gnu.org/licenses/>
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "indicator-message.h"
-
-typedef struct _IndicateIndicatorMessagePrivate IndicateIndicatorMessagePrivate;
-
-struct _IndicateIndicatorMessagePrivate
-{
-	gchar * subtype;
-};
-
-#define INDICATE_INDICATOR_MESSAGE_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATE_INDICATOR_MESSAGE_TYPE, IndicateIndicatorMessagePrivate))
-
-static void     indicate_indicator_message_class_init (IndicateIndicatorMessageClass *klass);
-static void     indicate_indicator_message_init       (IndicateIndicatorMessage *self);
-static void     indicate_indicator_message_dispose    (GObject *object);
-static void     indicate_indicator_message_finalize   (GObject *object);
-static const gchar *  get_indicator_type                    (IndicateIndicator * indicator);
-
-G_DEFINE_TYPE (IndicateIndicatorMessage, indicate_indicator_message, INDICATE_TYPE_INDICATOR);
-
-static void
-indicate_indicator_message_class_init (IndicateIndicatorMessageClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (IndicateIndicatorMessagePrivate));
-
-	object_class->dispose = indicate_indicator_message_dispose;
-	object_class->finalize = indicate_indicator_message_finalize;
-
-	IndicateIndicatorClass * indicator_class = INDICATE_INDICATOR_CLASS(klass);
-
-	indicator_class->get_type = get_indicator_type;
-
-	return;
-}
-
-static void
-indicate_indicator_message_init (IndicateIndicatorMessage *self)
-{
-}
-
-static void
-indicate_indicator_message_dispose (GObject *object)
-{
-G_OBJECT_CLASS (indicate_indicator_message_parent_class)->dispose (object);
-}
-
-static void
-indicate_indicator_message_finalize (GObject *object)
-{
-G_OBJECT_CLASS (indicate_indicator_message_parent_class)->finalize (object);
-}
-
-/**
-	indicate_indicator_message_new:
-
-	Builds a new indicator message object using #g_object_new.
-
-	Return value: A pointer to a new #IndicateIndicatorMessage object.
-*/
-static const gchar *
-get_indicator_type (IndicateIndicator * indicator)
-{
-	return "message";
-}
-
-IndicateIndicatorMessage *
-indicate_indicator_message_new (void)
-{
-	return g_object_new(INDICATE_TYPE_INDICATOR_MESSAGE, NULL);
-}
 
=== removed file 'libindicate/indicator-message.h'
--- libindicate/indicator-message.h	2009-05-01 02:45:19 +0000
+++ libindicate/indicator-message.h	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-/*
-A library to allow applictions to provide simple indications of
-information to be displayed to users of the application through the
-interface shell.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of either or both of the following licenses:
-
-1) the GNU Lesser General Public License version 3, as published by the 
-Free Software Foundation; and/or
-2) the GNU Lesser General Public License version 2.1, as published by 
-the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the applicable version of the GNU Lesser General Public 
-License for more details.
-
-You should have received a copy of both the GNU Lesser General Public 
-License version 3 and version 2.1 along with this program.  If not, see 
-<http://www.gnu.org/licenses/>
-*/
-
-#ifndef __INDICATE_INDICATOR_MESSAGE_H__
-#define __INDICATE_INDICATOR_MESSAGE_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include "indicator.h"
-
-G_BEGIN_DECLS
-
-#define INDICATE_TYPE_INDICATOR_MESSAGE            (indicate_indicator_message_get_type ())
-#define INDICATE_INDICATOR_MESSAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATE_TYPE_INDICATOR_MESSAGE, IndicateIndicatorMessage))
-#define INDICATE_INDICATOR_MESSAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATE_TYPE_INDICATOR_MESSAGE, IndicateIndicatorMessageClass))
-#define INDICATE_IS_INDICATOR_MESSAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATE_TYPE_INDICATOR_MESSAGE))
-#define INDICATE_IS_INDICATOR_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATE_TYPE_INDICATOR_MESSAGE))
-#define INDICATE_INDICATOR_MESSAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATE_TYPE_INDICATOR_MESSAGE, IndicateIndicatorMessageClass))
-
-typedef struct _IndicateIndicatorMessage      IndicateIndicatorMessage;
-typedef struct _IndicateIndicatorMessageClass IndicateIndicatorMessageClass;
-
-/**
-	IndicateIndicatorMessageClass:
-	@parent_class: Parent Class
-
-	Subclass of #IndicateIndicator with no new functions or signals.
-*/
-struct _IndicateIndicatorMessageClass {
-	IndicateIndicatorClass parent_class;
-};
-
-/**
-	IndicateIndicatorMessage:
-
-	A class to represent indicators who's 'type' is "message".  These
-	are basically indicators that represent messages from humans to
-	humans via computers.  Things like instance messages, micro blogging
-	entries or e-mails.  All of these qualify as messages.
-
-	TODO: This should include a list of properties that are supported.
-*/
-struct _IndicateIndicatorMessage {
-	IndicateIndicator parent;
-};
-
-GType indicate_indicator_message_get_type (void);
-IndicateIndicatorMessage * indicate_indicator_message_new (void);
-
-/**
-	SECTION:indicator-message
-	@short_description: A representation of human generated messages
-	@stability: Unstable
-	@include: libindicate/indicator-message.h
-
-	The message indicators represent messages that come from humans
-	to humans using computers.  They come in all different forms with
-	various different interaction protocols, but they all want the human
-	at the computer to interact back with the human that sent the
-	message.
-*/
-
-G_END_DECLS
-
-#endif
 
=== added file 'libindicate/indicator-messages.h'
--- libindicate/indicator-messages.h	1970-01-01 00:00:00 +0000
+++ libindicate/indicator-messages.h	2009-09-04 17:44:23 +0000
@@ -0,0 +1,40 @@
+/*
+A library to allow applictions to provide simple indications of
+information to be displayed to users of the application through the
+interface shell.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of either or both of the following licenses:
+
+1) the GNU Lesser General Public License version 3, as published by the 
+Free Software Foundation; and/or
+2) the GNU Lesser General Public License version 2.1, as published by 
+the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the applicable version of the GNU Lesser General Public 
+License for more details.
+
+You should have received a copy of both the GNU Lesser General Public 
+License version 3 and version 2.1 along with this program.  If not, see 
+<http://www.gnu.org/licenses/>
+*/
+
+#ifndef INDICATE_INDICATOR_MESSAGES_H_INCLUDED__
+#define INDICATE_INDICATOR_MESSAGES_H_INCLUDED__ 1
+
+#define INDICATE_INDICATOR_MESSAGES_PROP_NAME       "name"
+#define INDICATE_INDICATOR_MESSAGES_PROP_ICON       "icon"
+#define INDICATE_INDICATOR_MESSAGES_PROP_COUNT      "count"
+#define INDICATE_INDICATOR_MESSAGES_PROP_TIME       "time"
+#define INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION  "draw-attention"
+
+
+#endif /* INDICATE_INDICATOR_MESSAGES_H_INCLUDED__ */
 
=== modified file 'libindicate/indicator.c'
--- libindicate/indicator.c	2009-08-06 13:57:57 +0000
+++ libindicate/indicator.c	2009-09-01 17:05:33 +0000
@@ -38,6 +38,7 @@
 	SHOW,
 	USER_DISPLAY,
 	MODIFIED,
+	DISPLAYED,
 	LAST_SIGNAL
 };
 
@@ -50,6 +51,7 @@
 	gboolean is_visible;
 	IndicateServer * server;
 	GHashTable * properties;
+	gboolean is_displayed;
 };
 
 #define INDICATE_INDICATOR_GET_PRIVATE(o) \
@@ -140,8 +142,23 @@
 	                                     NULL, NULL,
 	                                     g_cclosure_marshal_VOID__STRING,
 	                                     G_TYPE_NONE, 1, G_TYPE_STRING);
-
-	class->get_type = NULL;
+	/**
+		IndicateIndicator::displayed:
+		@arg0: The #IndicateIndicator object
+		@arg1: Whether the indicator has been displayed
+
+		This is the signal that the indicator has been displayed, or
+		hidden by a listener.  In most cases, the signal will be that it
+		has been displayed as most folks don't go hiding it later.
+	*/
+	signals[DISPLAYED] = g_signal_new(INDICATE_INDICATOR_SIGNAL_DISPLAYED,
+	                                     G_TYPE_FROM_CLASS(class),
+	                                     G_SIGNAL_RUN_LAST,
+	                                     G_STRUCT_OFFSET(IndicateIndicatorClass, displayed),
+	                                     NULL, NULL,
+	                                     g_cclosure_marshal_VOID__BOOLEAN,
+	                                     G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
 	class->set_property = set_property;
 	class->get_property = get_property;
 	class->list_properties = list_properties;
@@ -156,6 +173,7 @@
 	IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator);
 
 	priv->is_visible = FALSE;
+	priv->is_displayed = FALSE;
 
 	priv->properties = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 
@@ -301,6 +319,8 @@
 
 	priv->is_visible = FALSE;
 	g_signal_emit(indicator, signals[HIDE], 0, TRUE);
+	priv->is_displayed = FALSE;
+	g_signal_emit(G_OBJECT(indicator), signals[DISPLAYED], 0, priv->is_displayed, TRUE);
 
 	return;
 }
@@ -339,28 +359,6 @@
 }
 
 /**
-	indicate_indicator_get_indicator_type:
-	@indicator: a #IndicateIndicator to act on
-
-	Returns the type of @indicator.  This is largely set by the subclass
-	that the indicator was built with and should not be free'd.
-
-	Return value: A string defining the type or NULL for no type.
-*/
-const gchar *
-indicate_indicator_get_indicator_type (IndicateIndicator * indicator)
-{
-	g_return_val_if_fail(INDICATE_IS_INDICATOR(indicator), NULL);
-	IndicateIndicatorClass * class = INDICATE_INDICATOR_GET_CLASS(indicator);
-
-	if (class->get_type != NULL) {
-		return INDICATE_INDICATOR_GET_CLASS(indicator)->get_type(indicator);
-	}
-
-	return NULL;
-}
-
-/**
 	indicate_indicator_user_display:
 	@indicator: a #IndicateIndicator to act on
 
@@ -451,8 +449,7 @@
 	@indicator: a #IndicateIndicator to act on
 
 	This function gets a list of all the properties that exist
-	on a @indicator.  The array may have zero entries but almost
-	always at least has 'type' in it.
+	on a @indicator.  The array may have zero entries.
 
 	Return value: An array of strings that is the keys of all
 		the properties on this indicator.
@@ -473,11 +470,6 @@
 {
 	g_return_if_fail(INDICATE_IS_INDICATOR(indicator));
 
-	if (key != NULL && !g_strcmp0(key, "type")) {
-		g_warning("Trying to set the 'type' of an indicator which should be done through subclassing.");
-		return;
-	}
-
 	IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator);
 
 	gchar * current = g_hash_table_lookup(priv->properties, key);
@@ -500,10 +492,6 @@
 {
 	g_return_val_if_fail(INDICATE_IS_INDICATOR(indicator), NULL);
 
-	if (key != NULL && !g_strcmp0(key, "type")) {
-		return indicate_indicator_get_indicator_type(indicator);
-	}
-
 	IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator);
 
 	// TODO: Think about whether we should be strdup'ing this.  Seems like overkill, but might not be.
@@ -519,10 +507,50 @@
 	GList * keys = g_hash_table_get_keys(priv->properties);
 	GPtrArray * properties = g_ptr_array_sized_new(g_list_length(keys) + 1);
 
-	g_ptr_array_add(properties, g_strdup("type"));
 	for (; keys != NULL; keys = keys->next) {
 		g_ptr_array_add(properties, g_strdup(keys->data));
 	}
 
 	return properties;
 }
+
+/**
+	indicate_indicator_set_displayed:
+	@indicator: The #IndicateIndicator to configure
+	@displayed: Whether or not the indicator is visible to users
+
+	Sets whether or not the indicator is visible to the user from
+	a listener.  This does not include things like whether the menu
+	is open, but more whether it's in the menu to be found.
+*/
+void
+indicate_indicator_set_displayed (IndicateIndicator * indicator, gboolean displayed)
+{
+	g_return_if_fail(INDICATE_IS_INDICATOR(indicator));
+	IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator);
+
+	if (priv->is_displayed != displayed) {
+		priv->is_displayed = displayed;
+		g_signal_emit(G_OBJECT(indicator), signals[DISPLAYED], 0, displayed, TRUE);
+	}
+
+	return;
+}
+
+/**
+	indicate_indicator_get_displayed:
+	@indicator: The #IndicateIndicator to query
+
+	Checks to see if the indicator is visible to users in some way.
+
+	Return value: Whether or not this indicator can be seen by a user
+		or not.
+*/
+gboolean
+indicate_indicator_get_displayed (IndicateIndicator * indicator)
+{
+	g_return_val_if_fail(INDICATE_IS_INDICATOR(indicator), FALSE);
+	IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator);
+	return priv->is_visible && priv->is_displayed;
+}
+
 
=== modified file 'libindicate/indicator.h'
--- libindicate/indicator.h	2009-08-05 13:51:59 +0000
+++ libindicate/indicator.h	2009-08-31 21:26:29 +0000
@@ -46,10 +46,11 @@
 /* This is a signal that signals to the indicator that the user
  * has done an action where they'd like this indicator to be
  * displayed. */
-#define INDICATE_INDICATOR_SIGNAL_HIDE  "hide"
-#define INDICATE_INDICATOR_SIGNAL_SHOW  "show"
-#define INDICATE_INDICATOR_SIGNAL_DISPLAY  "user-display"
+#define INDICATE_INDICATOR_SIGNAL_HIDE      "hide"
+#define INDICATE_INDICATOR_SIGNAL_SHOW      "show"
+#define INDICATE_INDICATOR_SIGNAL_DISPLAY   "user-display"
 #define INDICATE_INDICATOR_SIGNAL_MODIFIED  "modified"
+#define INDICATE_INDICATOR_SIGNAL_DISPLAYED "displayed"
 
 typedef struct _IndicateIndicator IndicateIndicator;
 typedef struct _IndicateIndicatorClass IndicateIndicatorClass;
@@ -75,9 +76,7 @@
 	@show: Slot for #IndicateIndicator::show.
 	@user_display: Slot for #IndicateIndicator::user-display.
 	@modified: Slot for #IndicateIndicator::modified.
-	@get_type: Returns a constant string for the type of this indicator.
-		Typically gets overridden by subclasses and defines the type of
-		the indicator.  Is called by indicate_indicator_get_indicator_type().
+	@displayed: Slot for #IndicateIndicator::displayed.
 	@set_property: Called when indicate_indicator_set_property() is called
 		and should set the value.  While typically it is overridden by
 		subclasses they usually handle special properties themselves and
@@ -87,6 +86,10 @@
 	@list_properties: Called when indicate_indicator_list_properties() is called
 		and returns a list of the properties available.  Again this can be
 		overridden by subclasses to handle special properties.
+	@indicate_indicator_reserved1: Reserved for future use
+	@indicate_indicator_reserved2: Reserved for future use
+	@indicate_indicator_reserved3: Reserved for future use
+	@indicate_indicator_reserved4: Reserved for future use
 
 	All of the functions that are used to modify or change data that is
 	in the indicator.  Typically gets subclassed by other types of 
@@ -94,17 +97,26 @@
 
 */
 struct _IndicateIndicatorClass {
+	/* Parents */
 	GObjectClass parent_class;
 
+	/* Signals */
 	void (*hide) (IndicateIndicator * indicator, gpointer data);
 	void (*show) (IndicateIndicator * indicator, gpointer data);
 	void (*user_display) (IndicateIndicator * indicator, gpointer data);
 	void (*modified) (IndicateIndicator * indicator, gchar * property, gpointer data);
+	void (*displayed) (IndicateIndicator * indicator, gboolean displayed);
 
-	const gchar * (*get_type) (IndicateIndicator * indicator);
+	/* Subclassable functions */
 	void (*set_property) (IndicateIndicator * indicator, const gchar * key, const gchar * data);
 	const gchar * (*get_property) (IndicateIndicator * indicator, const gchar * key);
 	GPtrArray * (*list_properties) (IndicateIndicator * indicator);
+
+	/* Reserver for future use */
+	void (*indicate_indicator_reserved1)(void);
+	void (*indicate_indicator_reserved2)(void);
+	void (*indicate_indicator_reserved3)(void);
+	void (*indicate_indicator_reserved4)(void);
 };
 
 GType indicate_indicator_get_type(void) G_GNUC_CONST;
@@ -125,10 +137,6 @@
 /* Every entry has an ID, here's how to get it */
 guint indicate_indicator_get_id (IndicateIndicator * indicator);
 
-/* Every entry has a type.  This should be created by the
- * subclass and exported through this pretty function */
-const gchar * indicate_indicator_get_indicator_type (IndicateIndicator * indicator);
-
 void indicate_indicator_user_display (IndicateIndicator * indicator);
 
 /* Properties handling */
@@ -137,6 +145,10 @@
 const gchar * indicate_indicator_get_property (IndicateIndicator * indicator, const gchar * key);
 GPtrArray * indicate_indicator_list_properties (IndicateIndicator * indicator);
 
+/* Controling whether it's displayed */
+void indicate_indicator_set_displayed (IndicateIndicator * indicator, gboolean displayed);
+gboolean indicate_indicator_get_displayed (IndicateIndicator * indicator);
+
 /**
 	SECTION:indicator
 	@short_description: A representation of state for applications
@@ -144,7 +156,7 @@
 	@include: libindicate/indicator.h
 
 	An indicator is designed to represent a single instance of something
-	in your application.  So this might be an IM or Email using #IndicateIndicatorMessage
+	in your application.  So this might be an IM or an e-mail mail box
 	or any other thing that is a small unit of information to pass on
 	to the user.
 
@@ -154,12 +166,7 @@
 	on the indicator to provide enough information for the listener
 	to do that.
 
-	Mostly this is done through properties.  The only property that is
-	defined for the base indicator is the 'type' property.  And this
-	is only available to set by creating a subclass of the 
-	#IndicateIndicator object.  It is assumed that you can look at the
-	definitions of the various subtypes to determine which properties
-	they support.
+	Mostly this is done through properties.
 
 	It may be that some users don't want to create objects for every
 	indicator as it could be a lot of overhead if there are large numbers
 
=== modified file 'libindicate/listener-marshal.list'
--- libindicate/listener-marshal.list	2009-04-10 09:51:16 +0000
+++ libindicate/listener-marshal.list	2009-09-05 04:24:47 +0000
@@ -28,8 +28,10 @@
 # IndicatorAdded, IndicatorRemoved, IndicatorModified
 VOID:UINT,STRING
 # Local indicator_added, indicator_removed
+VOID:POINTER,POINTER
+# Local indicator_modified
 VOID:POINTER,POINTER,STRING
-# Local indicator_modified
-VOID:POINTER,POINTER,STRING,STRING
 # Local server_added and server_removed
 VOID:POINTER,STRING
+# Local server_count_changed
+VOID:POINTER,UINT
 
=== modified file 'libindicate/listener-private.h'
--- libindicate/listener-private.h	2009-08-03 22:31:00 +0000
+++ libindicate/listener-private.h	2009-08-28 21:59:26 +0000
@@ -35,6 +35,7 @@
 	DBusGProxy * proxy;
 	DBusGConnection * connection;
 	gboolean interests[INDICATE_INTEREST_LAST];
+	gint max_indicators;
 };
 
 struct _IndicateListenerIndicator {
@@ -55,6 +56,8 @@
 
 	GArray * proxy_todo;
 	guint todo_idle;
+
+	gint max_indicators;
 };
 
 #define INDICATE_LISTENER_GET_PRIVATE(o) \
 
=== modified file 'libindicate/listener.c'
--- libindicate/listener.c	2009-08-03 22:31:00 +0000
+++ libindicate/listener.c	2009-09-08 22:01:57 +0000
@@ -49,6 +49,7 @@
 	INDICATOR_MODIFIED,
 	SERVER_ADDED,
 	SERVER_REMOVED,
+	SERVER_COUNT_CHANGED,
 	LAST_SIGNAL
 };
 
@@ -98,13 +99,14 @@
 static void todo_list_add (const gchar * name, DBusGProxy * proxy, IndicateListener * listener, gboolean startup);
 static gboolean todo_idle (gpointer data);
 static void get_type_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * type, gpointer data);
+static void proxy_indicator_added_legacy (DBusGProxy * proxy, guint id, gchar * type, proxy_t * proxyt);
 static void proxy_server_added (DBusGProxy * proxy, const gchar * type, proxy_t * proxyt);
-static void proxy_indicator_added (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt);
-static void proxy_indicator_removed (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt);
-static void proxy_indicator_modified (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt);
+static void proxy_indicator_added (DBusGProxy * proxy, guint id, proxy_t * proxyt);
+static void proxy_indicator_removed_legacy (DBusGProxy * proxy, guint id, gchar * type, proxy_t * proxyt);
+static void proxy_indicator_removed (DBusGProxy * proxy, guint id, proxy_t * proxyt);
+static void proxy_indicator_modified (DBusGProxy * proxy, guint id, const gchar * property, proxy_t * proxyt);
+static void proxy_server_count_changed (DBusGProxy * proxy, guint count, proxy_t * proxyt);
 static void proxy_get_indicator_list (DBusGProxy * proxy, GArray * indicators, GError * error, gpointer data);
-static void proxy_get_indicator_type (DBusGProxy * proxy, gchar * type, GError * error, gpointer data);
-static void proxy_indicators_free (gpointer data);
 static void introspect_this (DBusGProxy * proxy, char * OUT_data, GError * error, gpointer data);
 
 /* DBus interface */
@@ -130,22 +132,22 @@
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateListenerClass, indicator_added),
 	                                        NULL, NULL,
-	                                        _indicate_listener_marshal_VOID__POINTER_POINTER_STRING,
-	                                        G_TYPE_NONE, 3, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR, G_TYPE_STRING);
+	                                        _indicate_listener_marshal_VOID__POINTER_POINTER,
+	                                        G_TYPE_NONE, 2, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR);
 	signals[INDICATOR_REMOVED] = g_signal_new(INDICATE_LISTENER_SIGNAL_INDICATOR_REMOVED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateListenerClass, indicator_removed),
 	                                        NULL, NULL,
-	                                        _indicate_listener_marshal_VOID__POINTER_POINTER_STRING,
-	                                        G_TYPE_NONE, 3, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR, G_TYPE_STRING);
+	                                        _indicate_listener_marshal_VOID__POINTER_POINTER,
+	                                        G_TYPE_NONE, 2, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR);
 	signals[INDICATOR_MODIFIED] = g_signal_new(INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateListenerClass, indicator_modified),
 	                                        NULL, NULL,
-	                                        _indicate_listener_marshal_VOID__POINTER_POINTER_STRING_STRING,
-	                                        G_TYPE_NONE, 4, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR, G_TYPE_STRING, G_TYPE_STRING);
+	                                        _indicate_listener_marshal_VOID__POINTER_POINTER_STRING,
+	                                        G_TYPE_NONE, 3, INDICATE_TYPE_LISTENER_SERVER, INDICATE_TYPE_LISTENER_INDICATOR, G_TYPE_STRING);
 	signals[SERVER_ADDED] = g_signal_new(INDICATE_LISTENER_SIGNAL_SERVER_ADDED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
@@ -160,6 +162,13 @@
 	                                        NULL, NULL,
 	                                        _indicate_listener_marshal_VOID__POINTER_STRING,
 	                                        G_TYPE_NONE, 2, INDICATE_TYPE_LISTENER_SERVER, G_TYPE_STRING);
+	signals[SERVER_COUNT_CHANGED] = g_signal_new(INDICATE_LISTENER_SIGNAL_SERVER_COUNT_CHANGED,
+	                                        G_TYPE_FROM_CLASS (class),
+	                                        G_SIGNAL_RUN_LAST,
+	                                        G_STRUCT_OFFSET (IndicateListenerClass, server_count_changed),
+	                                        NULL, NULL,
+	                                        _indicate_listener_marshal_VOID__POINTER_UINT,
+	                                        G_TYPE_NONE, 2, INDICATE_TYPE_LISTENER_SERVER, G_TYPE_UINT);
 
 	dbus_g_object_register_marshaller(_indicate_listener_marshal_VOID__UINT_STRING,
 	                                  G_TYPE_NONE,
@@ -235,6 +244,8 @@
 	priv->proxy_todo = g_array_new(FALSE, TRUE, sizeof(proxy_todo_t));
 	priv->todo_idle = 0;
 
+	priv->max_indicators = -1;
+
 	/*            WARNING              */
 	/* Starting massive asynchronisity */
 	/*                                 */
@@ -290,11 +301,15 @@
 	return default_indicate_listener;
 }
 
+/* Function to track when people get on and off the bus.  It's the
+   same function for both system and session buses so it needs to
+   figure which one it's on. */
 static void
 dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, IndicateListener * listener)
 {
 	IndicateListenerPrivate * priv = INDICATE_LISTENER_GET_PRIVATE(listener);
 
+	/* Figure out which bus we are. */
 	DBusGConnection * bus;
 	gchar * bus_name;
 	if (proxy == priv->dbus_proxy_system) {
@@ -307,9 +322,15 @@
 
 	/* g_debug("Name change on %s bus: '%s' from '%s' to '%s'", bus_name, name, prev, new); */
 
+	/* If someone is getting on the bus we add them to the
+	   todo list to see if they come up with something interesting */
 	if (prev != NULL && prev[0] == '\0') {
 		todo_list_add(name, proxy, listener, FALSE);
 	}
+
+	/* If they're leaving the bus we need to figure out if we
+	   were tracking them or not, and remove them from the
+	   appropriate lists. */
 	if (new != NULL && new[0] == '\0') {
 		proxy_t searchitem;
 		searchitem.connection = bus;
@@ -334,19 +355,11 @@
 static void
 proxy_struct_destroy_indicators (gpointer key, gpointer value, gpointer data)
 {
-	gchar * type = (gchar *)key;
-	GHashTable * indicators = (GHashTable *)value;
-	proxy_t * proxy_data = data;
+	proxy_t * proxy_data = (proxy_t *)data;
 
-	GList * keys = g_hash_table_get_keys(indicators);
-	GList * indicator;
-	for (indicator = keys; indicator != NULL; indicator = indicator->next) {
-		guint id = (guint)indicator->data;
-		g_signal_emit(proxy_data->listener, signals[INDICATOR_REMOVED], 0, &proxy_data->server, GUINT_TO_POINTER(id), type, TRUE);
+	if (value) {
+		g_signal_emit(proxy_data->listener, signals[INDICATOR_REMOVED], 0, &proxy_data->server, GUINT_TO_POINTER(key), TRUE);
 	}
-	g_list_free(keys);
-
-	g_hash_table_remove_all(indicators);
 	return;
 }
 
@@ -360,7 +373,7 @@
 		g_hash_table_foreach(proxy_data->indicators,
 							 proxy_struct_destroy_indicators,
 							 proxy_data);
-		g_hash_table_remove_all(proxy_data->indicators);
+		g_hash_table_destroy(proxy_data->indicators);
 
 		g_signal_emit(proxy_data->listener, signals[SERVER_REMOVED], 0, &proxy_data->server, proxy_data->type, TRUE);
 		proxy_data->indicators = NULL;
@@ -470,6 +483,7 @@
 	proxyt->server.name = todo->name;
 	proxyt->server.proxy = proxyt->proxy;
 	proxyt->server.connection = proxyt->connection;
+	proxyt->server.max_indicators = priv->max_indicators;
 
 	priv->proxy_todo = g_array_remove_index(priv->proxy_todo, priv->proxy_todo->len - 1);
 
@@ -509,11 +523,21 @@
 	return;
 }
 
-typedef struct {
-	guint id;
-	proxy_t * proxyt;
-} indicator_type_t;
+/* A call back from setting the max indicators.  We really can't
+   do anything about it, so this function is kinda useless. */
+void
+set_max_indicators_cb (DBusGProxy * proxy, GError * error, gpointer userdata)
+{
+	if (error != NULL) {
+		g_warning("Unable to set the max indicators on '%s': %s", (gchar *)userdata, error->message);
+		g_error_free(error);
+	}
+	return;
+}
 
+/* Callback from the call to get the indicator list on new
+   servers that we've found through introspection.  It takes
+   the list and then calls indicator_added on each one. */
 static void
 proxy_get_indicator_list (DBusGProxy * proxy, GArray * indicators, GError * error, gpointer data)
 {
@@ -525,42 +549,31 @@
 
 	int i;
 	for (i = 0; i < indicators->len; i++) {
-		indicator_type_t * itt = g_new(indicator_type_t, 1);
-		itt->id = g_array_index(indicators, guint, i);
-		itt->proxyt = proxyt;
-
-		org_freedesktop_indicator_get_indicator_property_async(proxyt->proxy, itt->id, "type", proxy_get_indicator_type, itt);
+		guint id = g_array_index(indicators, guint, i);
+		proxy_indicator_added(proxy, id, proxyt);
 	}
 
 	return;
 }
 
-static void
-proxy_get_indicator_type (DBusGProxy * proxy, gchar * type, GError * error, gpointer data)
-{
-	if (error != NULL) {
-		g_warning("Get Indicator Type returned error: %s", error->message);
-		return;
-	}
-
-	indicator_type_t * itt = (indicator_type_t *)data;
-	guint id = itt->id;
-	proxy_t * proxyt = itt->proxyt;
-
-	g_free(itt);
-
-	return proxy_indicator_added(proxy, id, type, proxyt);
-}
-
+/* Function called on the ServerShow signal from the bus, which is
+   usually when a DBus client says that they have some indicators
+   that we could be interested in.  Also, this function is called
+   in the discovery phase of starting up a new listener if we find
+   some indicators on the client. */
 static void
 proxy_server_added (DBusGProxy * proxy, const gchar * type, proxy_t * proxyt)
 {
+	g_debug("Proxy Server Added");
+	/* Check to see if we have an indicators table.  If we
+	   do this function's probably already been run.  If not
+	   we need to trick this server out. */
 	if (proxyt->indicators == NULL) {
-		proxyt->indicators = g_hash_table_new_full(g_str_hash, g_str_equal,
-		                                           g_free, proxy_indicators_free);
-		/* Elevate to working */
+		proxyt->indicators = g_hash_table_new(g_direct_hash, g_direct_equal);
+
 		IndicateListenerPrivate * priv = INDICATE_LISTENER_GET_PRIVATE(proxyt->listener);
 
+		/* Move the proxy from 'possible' to 'working'. */
 		GList * proxyt_item;
 		proxyt_item = g_list_find_custom(priv->proxies_possible, proxyt, proxy_t_equal);
 		if (proxyt_item != NULL) {
@@ -568,19 +581,35 @@
 		}
 		priv->proxies_working = g_list_prepend(priv->proxies_working, proxyt);
 
+		/* Connect to all the indicator based signals
+		   that are coming from this server */
 		dbus_g_proxy_add_signal(proxyt->proxy, "IndicatorAdded",
 								G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
 		dbus_g_proxy_connect_signal(proxyt->proxy, "IndicatorAdded",
+									G_CALLBACK(proxy_indicator_added_legacy), proxyt, NULL);
+		dbus_g_proxy_add_signal(proxyt->proxy, "IndicatorNew",
+								G_TYPE_UINT, G_TYPE_INVALID);
+		dbus_g_proxy_connect_signal(proxyt->proxy, "IndicatorNew",
 									G_CALLBACK(proxy_indicator_added), proxyt, NULL);
 		dbus_g_proxy_add_signal(proxyt->proxy, "IndicatorRemoved",
 								G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
 		dbus_g_proxy_connect_signal(proxyt->proxy, "IndicatorRemoved",
+									G_CALLBACK(proxy_indicator_removed_legacy), proxyt, NULL);
+		dbus_g_proxy_add_signal(proxyt->proxy, "IndicatorDelete",
+								G_TYPE_UINT, G_TYPE_INVALID);
+		dbus_g_proxy_connect_signal(proxyt->proxy, "IndicatorDelete",
 									G_CALLBACK(proxy_indicator_removed), proxyt, NULL);
 		dbus_g_proxy_add_signal(proxyt->proxy, "IndicatorModified",
 								G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
 		dbus_g_proxy_connect_signal(proxyt->proxy, "IndicatorModified",
 									G_CALLBACK(proxy_indicator_modified), proxyt, NULL);
+		dbus_g_proxy_add_signal(proxyt->proxy, "ServerCountChanged",
+								G_TYPE_UINT, G_TYPE_INVALID);
+		dbus_g_proxy_connect_signal(proxyt->proxy, "ServerCountChanged",
+									G_CALLBACK(proxy_server_count_changed), proxyt, NULL);
 
+		/* If we've got a type let it override the type
+		   we had here before */
 		if (type != NULL) {
 			if (proxyt->type != NULL) {
 				g_free(proxyt->type);
@@ -588,102 +617,125 @@
 			proxyt->type = g_strdup(type);
 		}
 
+		/* We're setting the max number of indicators from the default
+		   when we detect it.  This should give a reasonable amount of
+		   time for listeners to set the default if they want something
+		   different from infinite.  Otherwise it'd be easy to miss the
+		   first couple. */
+		proxyt->server.max_indicators = priv->max_indicators;
+		if (proxyt->server.max_indicators != -1) {
+			org_freedesktop_indicator_set_max_indicators_async(proxyt->proxy, proxyt->server.max_indicators, set_max_indicators_cb, proxyt->name);
+		}
+
+		/* Signal to clients of the listener that there's a new
+		   server.  Note the server parameter here is the pointer
+		   to the server struct in the proxy data structure. */
 		g_signal_emit(proxyt->listener, signals[SERVER_ADDED], 0, &proxyt->server, proxyt->type, TRUE);
 	}
 
 	return;
 }
 
-static void
-proxy_indicator_added (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt)
-{
+/* A fun little wrapper so that we can support the
+   signals on the indicator v1 interface.  It just drops
+   the type and calls the new function. */
+static void
+proxy_indicator_added_legacy (DBusGProxy * proxy, guint id, gchar * type, proxy_t * proxyt)
+{
+	return proxy_indicator_added(proxy, id, proxyt);
+}
+
+/* Gets called when we get a signal from the server that
+   there is a new indicator.  We put it into our list of
+   indicators and pass the signal up.  If the server hasn't
+   been known about before, we create the appropriate
+   structures for it. */
+static void
+proxy_indicator_added (DBusGProxy * proxy, guint id, proxy_t * proxyt)
+{
+	g_debug("Proxy Indicator Added");
+	g_return_if_fail(proxyt != NULL);
+
 	if (proxyt->indicators == NULL) {
 		proxy_server_added (proxy, NULL, proxyt);
 	}
 
-	GHashTable * indicators = g_hash_table_lookup(proxyt->indicators, type);
-
-	if (indicators == NULL) {
-		indicators = g_hash_table_new(g_direct_hash, g_direct_equal);
-		g_hash_table_insert(proxyt->indicators, g_strdup(type), indicators);
-	}
-
-	if (!g_hash_table_lookup(indicators, (gpointer)id)) {
-		g_hash_table_insert(indicators, (gpointer)id, (gpointer)TRUE);
-		g_signal_emit(proxyt->listener, signals[INDICATOR_ADDED], 0, &proxyt->server, GUINT_TO_POINTER(id), type, TRUE);
+	if (!g_hash_table_lookup(proxyt->indicators, GUINT_TO_POINTER(id))) {
+		g_hash_table_insert(proxyt->indicators, GUINT_TO_POINTER(id), GUINT_TO_POINTER(TRUE));
+		g_signal_emit(proxyt->listener, signals[INDICATOR_ADDED], 0, &proxyt->server, GUINT_TO_POINTER(id), TRUE);
 	}
 
 	return;
 }
 
-static void
-proxy_indicator_removed (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt)
-{
+/* A fun little wrapper so that we can support the
+   signals on the indicator v1 interface.  It just drops
+   the type and calls the new function. */
+static void
+proxy_indicator_removed_legacy (DBusGProxy * proxy, guint id, gchar * type, proxy_t * proxyt)
+{
+	return proxy_indicator_removed(proxy, id, proxyt);
+}
+
+/* A server removed an indicator.  This function removes all the
+   local data structures and then passes the signal up the stack.
+   */
+static void
+proxy_indicator_removed (DBusGProxy * proxy, guint id, proxy_t * proxyt)
+{
+	g_debug("Proxy Indicator Removed");
+	g_return_if_fail(proxyt != NULL);
+
 	if (proxyt->indicators == NULL) {
 		g_warning("Oddly we had an indicator removed from an interface that we didn't think had indicators.");
 		return;
 	}
 
-	GHashTable * indicators = g_hash_table_lookup(proxyt->indicators, type);
-	if (indicators == NULL) {
-		g_warning("Can not remove indicator %d of type '%s' as there are no indicators of that type on %s.", id, type, proxyt->name);
-		return;
-	}
-
-	if (!g_hash_table_lookup(indicators, (gpointer)id)) {
-		g_warning("No indicator %d of type '%s' on '%s'.", id, type, proxyt->name);
-		return;
-	}
-
-	g_hash_table_remove(indicators, (gpointer)id);
-	g_signal_emit(proxyt->listener, signals[INDICATOR_REMOVED], 0, &proxyt->server, GUINT_TO_POINTER(id), type, TRUE);
+	if (!g_hash_table_lookup(proxyt->indicators, GUINT_TO_POINTER(id))) {
+		g_warning("No indicator %d on '%s'.", id, proxyt->name);
+		return;
+	}
+
+	g_hash_table_remove(proxyt->indicators, GUINT_TO_POINTER(id));
+	g_signal_emit(proxyt->listener, signals[INDICATOR_REMOVED], 0, &proxyt->server, GUINT_TO_POINTER(id), TRUE);
 
 	return;
 }
 
+/* This is a signal from the server that a property on an indicator
+   has been modified.  We try and find the indicator, convert all
+   the parameters to the local ones, and then pass up the signal. */
 static void
 proxy_indicator_modified (DBusGProxy * proxy, guint id, const gchar * property, proxy_t * proxyt)
 {
+	g_debug("Proxy Indicator Modified");
+	g_return_if_fail(proxyt != NULL);
+
 	if (proxyt->indicators == NULL) {
 		g_warning("Oddly we had an indicator modified from an interface that we didn't think had indicators.");
 		return;
 	}
 
-	GList * keys = g_hash_table_get_keys(proxyt->indicators);
-	GList * inc = NULL;
-	gchar * type;
-
-	for (inc = g_list_first(keys); inc != NULL; inc = g_list_next(inc)) {
-		type = (gchar *)inc->data;
-
-		GHashTable * indicators = g_hash_table_lookup(proxyt->indicators, type);
-		if (indicators == NULL) continue; /* no indicators for this type?  Odd, but not an error */
-
-		if (g_hash_table_lookup(indicators, (gpointer)id)) {
-			break;
-		}
-	}
-
-	if (inc == NULL) {
+	if (!g_hash_table_lookup(proxyt->indicators, GUINT_TO_POINTER(id))) {
 		g_warning("Can not modify indicator %d with property '%s' as there are no indicators with that id on %s.", id, property, proxyt->name);
 		return;
 	}
 
-	g_signal_emit(proxyt->listener, signals[INDICATOR_MODIFIED], 0, &proxyt->server, GUINT_TO_POINTER(id), type, property, TRUE);
+	g_signal_emit(proxyt->listener, signals[INDICATOR_MODIFIED], 0, &proxyt->server, GUINT_TO_POINTER(id), property, TRUE);
 
 	return;
 }
 
+/* This function gets called when the dbus count
+   signal comes it.  Basically we're just translating
+   it into a local signal with the appropraite parameters
+   and structures. */
 static void
-proxy_indicators_free (gpointer data)
+proxy_server_count_changed (DBusGProxy * proxy, guint count, proxy_t * proxyt)
 {
-	GHashTable * table = (GHashTable *)data;
-
-	if (g_hash_table_size(table) != 0) {
-		g_warning("Clearning a set of indicators that wasn't signaled!");
-	}
-
-	g_hash_table_unref(table);
+	g_debug("Proxy Server Count Changed");
+	g_return_if_fail(proxyt != NULL);
+	g_signal_emit(proxyt->listener, signals[SERVER_COUNT_CHANGED], 0, &proxyt->server, count, TRUE);
 	return;
 }
 
@@ -742,7 +794,7 @@
 {
 	/* g_debug("get_property_helper: %s %d", property, prop_type); */
 	/* TODO: Do we need to somehow refcount the server/indicator while we're waiting on this? */
-	get_property_t * get_property_data = g_new(get_property_t, 1);
+	get_property_t * get_property_data = g_new0(get_property_t, 1);
 	get_property_data->cb = callback;
 	get_property_data->data = data;
 	get_property_data->listener = listener;
@@ -774,6 +826,8 @@
 	return TRUE;
 }
 
+/* A callback for asking an indicator to be displayed,
+   which is unlikely to fail.  So we're throwing a warning. */
 static void 
 listener_display_cb (DBusGProxy *proxy, GError *error, gpointer userdata)
 {
@@ -791,13 +845,57 @@
 	return;
 }
 
+/* A callback for saying an indicator is displayed,
+   which is unlikely to fail.  So we're throwing a warning. */
+static void 
+listener_displayed_cb (DBusGProxy *proxy, GError *error, gpointer userdata)
+{
+	if (error != NULL) {
+		g_warning("Listener displayed caused an error: %s", error->message);
+	}
+	return;
+}
+
+/**
+	indicate_listener_displayed:
+	@listener: The #IndicateListener representing the connection
+	@server: The server that the indicator is on
+	@indicator: Which indicator is being displayed
+	@displayed: Whether it's being displayed or hidden
+
+	This function tells the client whether we're showing this indicator
+	to the user.  This doesn't mean that it's necissarilly visible right
+	now, but more that there is a way for the user to get to this item
+	individually.
+*/
+void
+indicate_listener_displayed (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gboolean displayed)
+{
+	org_freedesktop_indicator_indicator_displayed_async (server->proxy,
+	                                                     INDICATE_LISTENER_INDICATOR_ID(indicator),
+	                                                     displayed,
+	                                                     listener_displayed_cb,
+	                                                     NULL);
+
+	if (!server->interests[INDICATE_INTEREST_INDICATOR_DISPLAY] && displayed) {
+		g_warning("It's awful odd that you said in the interest survey you weren't displaying indicators and then you displayed one.  I'm just saying, you've probably confused someone besides me.");
+	}
+
+	return;
+}
+
 typedef struct {
 	IndicateListener * listener;
 	IndicateListenerServer * server;
 	indicate_listener_get_server_property_cb cb;
+	indicate_listener_get_server_uint_property_cb cb_uint;
 	gpointer data;
 } property_cb_t;
 
+/* A callback from getting the property off of the server
+   which unravels the property_cb_t structure that was passed
+   as data and calls back the call back that was in it with
+   the appropriate data, also unrolled. */
 static void
 property_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
 {
@@ -807,6 +905,9 @@
 
 	GValue property = {0};
 
+	/* Finish the call and get our value.  There might
+	   be an error as if someone was using v1 API and
+	   not v2.  Let's handle that early. */
 	dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &property, G_TYPE_INVALID);
 	if (error != NULL) {
 		/* g_warning("Unable to get property: %s", error->message); */
@@ -815,28 +916,42 @@
 		return;
 	}
 
-	if (!G_VALUE_HOLDS_STRING(&property)) {
-		g_warning("Property returned is not a string!");
-		g_free(propertyt);
-		return;
-	}
-
+	/* Dup all the values and make them local so that
+	   we can free up the data structure to make the
+	   rest of the code easier to read. */
 	IndicateListener * listener = propertyt->listener;
 	IndicateListenerServer * server = propertyt->server;
 	indicate_listener_get_server_property_cb cb = propertyt->cb;
+	indicate_listener_get_server_uint_property_cb cb_uint = propertyt->cb_uint;
 	gpointer cb_data = propertyt->data;
 
 	g_free(propertyt);
 
-	gchar * propstr = g_value_dup_string(&property);
-
-	/* g_debug("\tProperty value: %s", propstr); */
-
-	return cb(listener, server, propstr, cb_data);
+	if (G_VALUE_HOLDS_STRING(&property) && cb != NULL) {
+		/* If it's got a string, and we have a value for that
+		   we'll get the string out and call the call back */
+		gchar * propstr = g_value_dup_string(&property);
+		return cb(listener, server, propstr, cb_data);
+	} else if (G_VALUE_HOLDS_UINT(&property) && cb_uint != NULL) {
+		/* If it's got a UINT and we have a callback for that
+		   let's grab the value and call the callback. */
+		guint val = g_value_get_uint(&property);
+		return cb_uint(listener, server, val, cb_data);
+	} else {
+		/* WTF!?!?!?! */
+		g_warning("Property back from server that we didn't understand.");
+	}
+
+	return;
 }
 
+/* This is a helper function for all the functions that
+   get properties from the server.  They all need to have
+   a callback setup with an intermediary data structure
+   and this function builds and populates that, then uses
+   a custom callback to call their callback */
 static void
-get_server_property (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_server_property_cb callback, const gchar * property_name, gpointer data)
+get_server_property (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_server_property_cb callback, indicate_listener_get_server_uint_property_cb callback_uint, const gchar * property_name, gpointer data)
 {
 	/* g_debug("Setting up callback for property %s on %s", property_name, INDICATE_LISTENER_SERVER_DBUS_NAME(server)); */
 	IndicateListenerPrivate * priv = INDICATE_LISTENER_GET_PRIVATE(listener);
@@ -864,10 +979,11 @@
 		                                                   DBUS_INTERFACE_PROPERTIES);
 	}
 
-	property_cb_t * localdata = g_new(property_cb_t, 1);
+	property_cb_t * localdata = g_new0(property_cb_t, 1);
 	localdata->listener = listener;
 	localdata->server = server;
 	localdata->cb = callback;
+	localdata->cb_uint = callback_uint;
 	localdata->data = data;
 
 	dbus_g_proxy_begin_call (proxyt->property_proxy,
@@ -885,13 +1001,19 @@
 void
 indicate_listener_server_get_type (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_server_property_cb callback, gpointer data)
 {
-	return get_server_property(listener, server, callback, "type", data);
+	return get_server_property(listener, server, callback, NULL, "type", data);
 }
 
 void
 indicate_listener_server_get_desktop (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_server_property_cb callback, gpointer data)
 {
-	return get_server_property(listener, server, callback, "desktop", data);
+	return get_server_property(listener, server, callback, NULL, "desktop", data);
+}
+
+void
+indicate_listener_server_get_count (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_server_uint_property_cb callback, gpointer data)
+{
+	return get_server_property(listener, server, NULL, callback, "count", data);
 }
 
 const gchar *
@@ -1015,7 +1137,7 @@
 
 		/* Check for root being "node" */
 		xmlNodePtr root = xmlDocGetRootElement(xmldoc);
-		if (g_strcmp0(root->name, "node") != 0) {
+		if (g_strcmp0((gchar *)root->name, "node") != 0) {
 			xmlFreeDoc(xmldoc);
 			g_warning("Introspection data from %s is not valid: %s", server->name, OUT_data);
 			return;
@@ -1038,12 +1160,12 @@
 		xmlNodePtr children;
 		for (children = root->children; children != NULL; children = children->next) {
 			gchar * xmlnameval = NULL;
-			if (g_strcmp0(children->name, nodename) == 0) {
+			if (g_strcmp0((gchar *)children->name, nodename) == 0) {
 				xmlAttrPtr attrib;
 				for (attrib = children->properties; attrib != NULL; attrib = attrib->next) {
-					if (g_strcmp0(attrib->name, "name") == 0) {
+					if (g_strcmp0((gchar *)attrib->name, "name") == 0) {
 						if (attrib->children != NULL) {
-							xmlnameval = attrib->children->content;
+							xmlnameval = (gchar *)attrib->children->content;
 						}
 						break;
 					}
@@ -1082,3 +1204,50 @@
 
 	return;
 }
+
+/**
+	indicate_listener_set_default_max_indicators:
+	@listener: Instance of #IndicateListener to set on.
+	@max: The new default number of max indicators.
+
+	This function sets the number that is given to new servers
+	when they start for the max number of indicators that you want
+	to see.  The client should enforce this number.
+
+	Note: This function WILL NOT reconfigure already recognized
+	      servers.  It only affects new servers.
+*/
+void
+indicate_listener_set_default_max_indicators (IndicateListener * listener, gint max)
+{
+	g_return_if_fail(INDICATE_IS_LISTENER(listener));
+	IndicateListenerPrivate * priv = INDICATE_LISTENER_GET_PRIVATE(listener);
+	priv->max_indicators = max;
+	return;
+}
+
+/**
+	indicate_listener_set_server_max_indicators:
+	@listener: Instance of #IndicateListener to set on.
+	@server: Server that the new max should be set on.
+	@max: The new number of max indicators.
+
+	This function changes the max number of indicators that
+	a server should send.  If the number is different than the
+	previous number a signal will be sent to the application to
+	adjust then number of indicators that they have.  This is
+	sent asynchronously.
+*/
+void
+indicate_listener_set_server_max_indicators (IndicateListener * listener, IndicateListenerServer * server, gint max)
+{
+	g_return_if_fail(INDICATE_IS_LISTENER(listener));
+	g_return_if_fail(server != NULL); /* All we can really check :-/ */
+
+	if (server->max_indicators != max) {
+		server->max_indicators = max;
+		org_freedesktop_indicator_set_max_indicators_async(server->proxy, server->max_indicators, set_max_indicators_cb, server->name);
+	}
+
+	return;
+}
 
=== modified file 'libindicate/listener.h'
--- libindicate/listener.h	2009-08-03 22:53:17 +0000
+++ libindicate/listener.h	2009-09-05 16:38:55 +0000
@@ -52,6 +52,7 @@
 #define INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED    "indicator-modified"
 #define INDICATE_LISTENER_SIGNAL_SERVER_ADDED          "server-added"
 #define INDICATE_LISTENER_SIGNAL_SERVER_REMOVED        "server-removed"
+#define INDICATE_LISTENER_SIGNAL_SERVER_COUNT_CHANGED  "server-count-changed"
 
 #define INDICATE_LISTENER_SERVER_DBUS_NAME(server)   (indicate_listener_server_get_dbusname(server))
 #define INDICATE_LISTENER_INDICATOR_ID(indicator)    (indicate_listener_indicator_get_id(indicator))
@@ -69,17 +70,42 @@
 	GObject parent;
 };
 
+/**
+	IndicateListenerClass:
+	@parent: Parent class #GObjectClass.
+	@indicator_added: Slot for IndicateListener::indicator-added.
+	@indicator_removed: Slot for IndicateListener::indicator-removed.
+	@indicator_modified: Slot for IndicateListener::indicator-modified.
+	@server_added: Slot for IndicateListener::server-added.
+	@server_removed: Slot for IndicateListener::server-removed.
+	@server_count_changed: Slot for IndicateListener::server-count-changed.
+	@indicate_listener_reserved1: Reserved for future use
+	@indicate_listener_reserved2: Reserved for future use
+	@indicate_listener_reserved3: Reserved for future use
+	@indicate_listener_reserved4: Reserved for future use
+
+	The class has all of the signals that are supplied by
+	the listener about what is happening on the server.
+*/
 typedef struct _IndicateListenerClass IndicateListenerClass;
 struct _IndicateListenerClass {
+	/* Parent */
 	GObjectClass parent;
 
 	/* Signals */
-	void (* indicator_added) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type);
-	void (* indicator_removed) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type);
-	void (* indicator_modified) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gchar * property);
+	void (* indicator_added) (IndicateListenerServer * server, IndicateListenerIndicator * indicator);
+	void (* indicator_removed) (IndicateListenerServer * server, IndicateListenerIndicator * indicator);
+	void (* indicator_modified) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property);
 
 	void (* server_added) (IndicateListenerServer * server, gchar * type);
 	void (* server_removed) (IndicateListenerServer * server, gchar * type);
+	void (* server_count_changed) (IndicateListenerServer * server, guint count);
+
+	/* Future Use */
+	void (*indicate_listener_reserved1)(void);
+	void (*indicate_listener_reserved2)(void);
+	void (*indicate_listener_reserved3)(void);
+	void (*indicate_listener_reserved4)(void);
 };
 
 GType indicate_listener_get_type (void) G_GNUC_CONST;
@@ -87,6 +113,7 @@
 typedef void (*indicate_listener_get_property_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data);
 typedef void (*indicate_listener_get_property_time_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GTimeVal * propertydata, gpointer data);
 typedef void (*indicate_listener_get_server_property_cb) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data);
+typedef void (*indicate_listener_get_server_uint_property_cb) (IndicateListener * listener, IndicateListenerServer * server, guint value, gpointer data);
 
 /* Create a new listener */
 IndicateListener *    indicate_listener_new                (void);
@@ -106,6 +133,10 @@
 void                  indicate_listener_display            (IndicateListener * listener,
                                                             IndicateListenerServer * server,
                                                             IndicateListenerIndicator * indicator);
+void                  indicate_listener_displayed          (IndicateListener * listener,
+                                                            IndicateListenerServer * server,
+                                                            IndicateListenerIndicator * indicator,
+                                                            gboolean displayed);
 void                  indicate_listener_server_get_type    (IndicateListener * listener,
                                                             IndicateListenerServer * server,
                                                             indicate_listener_get_server_property_cb callback,
@@ -114,6 +145,10 @@
                                                             IndicateListenerServer * server,
                                                             indicate_listener_get_server_property_cb callback,
                                                             gpointer data);
+void                  indicate_listener_server_get_count   (IndicateListener * listener,
+                                                            IndicateListenerServer * server,
+                                                            indicate_listener_get_server_uint_property_cb callback,
+                                                            gpointer data);
 const gchar *         indicate_listener_server_get_dbusname      (IndicateListenerServer * server);
 guint                 indicate_listener_indicator_get_id         (IndicateListenerIndicator * indicator);
 void                  indicate_listener_server_show_interest     (IndicateListener * listener,
@@ -125,6 +160,11 @@
 gboolean              indicate_listener_server_check_interest    (IndicateListener * listener,
                                                                   IndicateListenerServer * server,
                                                                   IndicateInterests interest);
+void                  indicate_listener_set_default_max_indicators (IndicateListener * listener,
+                                                                  gint max);
+void                  indicate_listener_set_server_max_indicators    (IndicateListener * listener,
+                                                                  IndicateListenerServer * server,
+                                                                  gint max);
 
 G_END_DECLS
 
 
=== modified file 'libindicate/server-marshal.list'
--- libindicate/server-marshal.list	2009-07-21 16:37:51 +0000
+++ libindicate/server-marshal.list	2009-08-28 19:55:12 +0000
@@ -26,4 +26,5 @@
 # <http://www.gnu.org/licenses/>
 #
 # IndicatorAdded
+VOID:UINT
 VOID:UINT,STRING
 
=== modified file 'libindicate/server.c'
--- libindicate/server.c	2009-08-05 00:25:55 +0000
+++ libindicate/server.c	2009-09-08 20:58:26 +0000
@@ -37,18 +37,19 @@
 enum {
 	NO_GET_DESKTOP,
 	NO_GET_INDICATOR_COUNT,
-	NO_GET_INDICATOR_COUNT_BY_TYPE,
 	NO_GET_INDICATOR_LIST,
-	NO_GET_INDICATOR_LIST_BY_TYPE,
 	NO_GET_INDICATOR_PROPERTY,
 	NO_GET_INDICATOR_PROPERTY_GROUP,
 	NO_GET_INDICATOR_PROPERTIES,
 	NO_SHOW_INDICATOR_TO_USER,
+	NO_INDICATOR_DISPLAYED,
 	INVALID_INDICATOR_ID,
 	NO_SHOW_INTEREST,
 	NO_REMOVE_INTEREST,
 	SHOW_INTEREST_FAILED,
 	REMOVE_INTEREST_FAILED,
+	NO_MAX_INDICATORS_SET,
+	MAX_INDICATORS_SET_FAILED,
 	LAST_ERROR
 };
 
@@ -62,6 +63,9 @@
 	SERVER_DISPLAY,
 	INTEREST_ADDED,
 	INTEREST_REMOVED,
+	MAX_INDICATORS_CHANGED,
+	INDICATOR_NOT_SHOWN,
+	SERVER_COUNT_CHANGED,
 	LAST_SIGNAL
 };
 
@@ -69,7 +73,8 @@
 enum {
 	PROP_0,
 	PROP_DESKTOP,
-	PROP_TYPE
+	PROP_TYPE,
+	PROP_COUNT
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -89,12 +94,17 @@
 
 	gchar * desktop;
 	gchar * type;
+	guint count;
 
 	// TODO: Should have a more robust way to track this, but this'll work for now
 	guint num_hidden;
 
-	gboolean interests[INDICATE_INTEREST_LAST];
+	/* Folks storage */
 	GList * interestedfolks;
+
+	/* Folks caches */
+	gint max_indicators;
+	gboolean interests[INDICATE_INTEREST_LAST];
 };
 
 #define INDICATE_SERVER_GET_PRIVATE(o) \
@@ -104,8 +114,12 @@
 struct _IndicateServerInterestedFolk {
 	gchar * sender;
 	gboolean interests[INDICATE_INTEREST_LAST];
+	gint max_indicators;
+	GHashTable * indicators_displayed;
 };
 
+static const gint MAX_INDICATORS_INFINITE = -1;
+static const gint MAX_INDICATORS_UNSET = -2;
 
 /* Define Type */
 G_DEFINE_TYPE (IndicateServer, indicate_server, G_TYPE_OBJECT);
@@ -113,20 +127,25 @@
 /* Prototypes */
 static void indicate_server_finalize (GObject * obj);
 static gboolean get_indicator_count (IndicateServer * server, guint * count, GError **error);
-static gboolean get_indicator_count_by_type (IndicateServer * server, gchar * type, guint * count, GError **error);
 static gboolean get_indicator_list (IndicateServer * server, GArray ** indicators, GError ** error);
-static gboolean get_indicator_list_by_type (IndicateServer * server, gchar * type, GArray ** indicators, GError ** error);
+static IndicateIndicator * get_indicator (IndicateServer * server, guint id, GError **error);
 static gboolean get_indicator_property (IndicateServer * server, guint id, gchar * property, gchar ** value, GError **error);
 static gboolean get_indicator_property_group (IndicateServer * server, guint id, GPtrArray * properties, gchar *** value, GError **error);
 static gboolean get_indicator_properties (IndicateServer * server, guint id, gchar *** properties, GError **error);
 static gboolean show_indicator_to_user (IndicateServer * server, guint id, GError ** error);
+static gboolean indicator_displayed (IndicateServer * server, gchar * sender, guint id, gboolean displayed, GError ** error);
 static void dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, IndicateServer * server);
+static void indicator_display_check_recalc (gpointer key, gpointer value, gpointer userdata);
+static void recalculate_indicator_displayed (IndicateServer * server, guint id);
 static guint get_next_id (IndicateServer * server);
 static void set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec);
 static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
 static gboolean show_interest (IndicateServer * server, gchar * sender, IndicateInterests interest);
 static gboolean remove_interest (IndicateServer * server, gchar * sender, IndicateInterests interest);
 static gboolean check_interest (IndicateServer * server, IndicateInterests intrest);
+static gint max_indicators_get (IndicateServer * server);
+static gboolean max_indicators_set (IndicateServer * server, gchar * sender, gint max);
+static void recalculate_max_indicators (IndicateServer * server);
 static gint indicate_server_interested_folks_equal (gconstpointer a, gconstpointer b);
 static void indicate_server_interested_folks_init (IndicateServerInterestedFolk * folk, gchar * sender);
 static void indicate_server_interested_folks_set (IndicateServerInterestedFolk * folk, IndicateInterests interest, gboolean value);
@@ -135,15 +154,15 @@
 
 /* DBus API */
 gboolean _indicate_server_get_indicator_count (IndicateServer * server, guint * count, GError **error);
-gboolean _indicate_server_get_indicator_count_by_type (IndicateServer * server, gchar * type, guint * count, GError **error);
 gboolean _indicate_server_get_indicator_list (IndicateServer * server, GArray ** indicators, GError ** error);
-gboolean _indicate_server_get_indicator_list_by_type (IndicateServer * server, gchar * type, GArray ** indicators, GError ** error);
 gboolean _indicate_server_get_indicator_property (IndicateServer * server, guint id, gchar * property, gchar ** value, GError **error);
 gboolean _indicate_server_get_indicator_property_group (IndicateServer * server, guint id, GPtrArray * properties, gchar *** value, GError **error);
 gboolean _indicate_server_get_indicator_properties (IndicateServer * server, guint id, gchar *** properties, GError **error);
 gboolean _indicate_server_show_indicator_to_user (IndicateServer * server, guint id, GError ** error);
+gboolean _indicate_server_indicator_displayed (IndicateServer * server, guint id, gboolean displayed, DBusGMethodInvocation * method);
 gboolean _indicate_server_show_interest (IndicateServer * server, gchar * interest, DBusGMethodInvocation * method);
 gboolean _indicate_server_remove_interest (IndicateServer * server, gchar * interest, DBusGMethodInvocation * method);
+gboolean _indicate_server_set_max_indicators (IndicateServer * server, gint max, DBusGMethodInvocation * method);
 
 /* Has to be after the dbus prototypes */
 #include "dbus-indicate-server.h"
@@ -168,38 +187,32 @@
 		IndicateServer::indicator-added:
 		@arg0: The #IndicateServer object
 		@arg1: The #IndicateIndicator ID number
-		@arg2: The type of the indicator
 
 		Emitted every time that a new indicator is made visible to
 		the world.  This results in a signal on DBus.
-
-		Can be emitted by subclasses using indicate_server_emit_indicator_added()
 	*/
 	signals[INDICATOR_ADDED] = g_signal_new(INDICATE_SERVER_SIGNAL_INDICATOR_ADDED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateServerClass, indicator_added),
 	                                        NULL, NULL,
-	                                        _indicate_server_marshal_VOID__UINT_STRING,
-	                                        G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+	                                        _indicate_server_marshal_VOID__UINT,
+	                                        G_TYPE_NONE, 1, G_TYPE_UINT);
 	/**
 		IndicateServer::indicator-removed:
 		@arg0: The #IndicateServer object
 		@arg1: The #IndicateIndicator ID number
-		@arg2: The type of the indicator
 
 		Emitted every time that a new indicator is made invisible to
 		the world.  This results in a signal on DBus.
-
-		Can be emitted by subclasses using indicate_server_emit_indicator_removed()
 	*/
 	signals[INDICATOR_REMOVED] = g_signal_new(INDICATE_SERVER_SIGNAL_INDICATOR_REMOVED,
 	                                        G_TYPE_FROM_CLASS (class),
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateServerClass, indicator_removed),
 	                                        NULL, NULL,
-	                                        _indicate_server_marshal_VOID__UINT_STRING,
-	                                        G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
+	                                        _indicate_server_marshal_VOID__UINT,
+	                                        G_TYPE_NONE, 1, G_TYPE_UINT);
 	/**
 		IndicateServer::indicator-modified:
 		@arg0: The #IndicateServer object
@@ -208,8 +221,6 @@
 
 		Emitted every time that a property on an indicator changes
 		and it is visible to the world.  This results in a signal on DBus.
-
-		Can be emitted by subclasses using indicate_server_emit_indicator_modified()
 	*/
 	signals[INDICATOR_MODIFIED] = g_signal_new(INDICATE_SERVER_SIGNAL_INDICATOR_MODIFIED,
 	                                        G_TYPE_FROM_CLASS (class),
@@ -256,8 +267,6 @@
 		Emitted when a listener signals that the server itself should be
 		displayed.  This signal is caused by a user clicking on the application
 		item in the Messaging Menu.  This signal is emitted by DBus.
-
-		Can be emitted by subclasses using indicate_server_emit_server_display()
 	*/
 	signals[SERVER_DISPLAY] = g_signal_new(INDICATE_SERVER_SIGNAL_SERVER_DISPLAY,
 	                                        G_TYPE_FROM_CLASS (class),
@@ -296,6 +305,36 @@
 	                                        NULL, NULL,
 	                                        g_cclosure_marshal_VOID__UINT,
 	                                        G_TYPE_NONE, 1, G_TYPE_UINT);
+	/**
+		IndicateServer::max-indicators-changed:
+		@arg0: The #IndicateServer object
+		@arg1: The new max number of indicators
+
+		Emitted when a listener either specifies their max number
+		to be higher, or at all.  The default is -1 or infinite.
+	*/
+	signals[MAX_INDICATORS_CHANGED] = g_signal_new(INDICATE_SERVER_SIGNAL_MAX_INDICATORS_CHANGED,
+	                                        G_TYPE_FROM_CLASS (class),
+	                                        G_SIGNAL_RUN_LAST,
+	                                        G_STRUCT_OFFSET (IndicateServerClass, max_indicators_changed),
+	                                        NULL, NULL,
+	                                        g_cclosure_marshal_VOID__INT,
+	                                        G_TYPE_NONE, 1, G_TYPE_INT);
+	/**
+		IndicateServer::server-count-changed:
+		@arg0: The #IndicateServer object
+		@arg1: The count variable on the server changed.
+
+		Emitted when the count property of the server changes
+		to a new value.
+	*/
+	signals[SERVER_COUNT_CHANGED] = g_signal_new(INDICATE_SERVER_SIGNAL_SERVER_COUNT_CHANGED,
+	                                        G_TYPE_FROM_CLASS (class),
+	                                        G_SIGNAL_RUN_LAST,
+	                                        G_STRUCT_OFFSET (IndicateServerClass, server_count_changed),
+	                                        NULL, NULL,
+	                                        g_cclosure_marshal_VOID__UINT,
+	                                        G_TYPE_NONE, 1, G_TYPE_UINT);
 
 	g_object_class_install_property (gobj, PROP_DESKTOP,
 	                                 g_param_spec_string("desktop", "Desktop File",
@@ -307,22 +346,28 @@
 	                                              "The type of indicators that this server will provide",
 	                                              "",
 	                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	g_object_class_install_property (gobj, PROP_COUNT,
+	                                 g_param_spec_uint("count", "Server Count",
+	                                              "A number reprsenting the number of items in a server",
+												  0, G_MAXUINT, 0,
+	                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	dbus_g_object_type_install_info(INDICATE_TYPE_SERVER,
 	                                &dbus_glib__indicate_server_object_info);
 
 	class->get_indicator_count = get_indicator_count;
-	class->get_indicator_count_by_type = get_indicator_count_by_type;
 	class->get_indicator_list = get_indicator_list;
-	class->get_indicator_list_by_type = get_indicator_list_by_type;
 	class->get_indicator_property = get_indicator_property;
 	class->get_indicator_property_group = get_indicator_property_group;
 	class->get_indicator_properties = get_indicator_properties;
 	class->show_indicator_to_user = show_indicator_to_user;
+	class->indicator_displayed = indicator_displayed;
 	class->get_next_id = get_next_id;
 	class->show_interest = show_interest;
 	class->remove_interest = remove_interest;
 	class->check_interest = check_interest;
+	class->max_indicators_get = max_indicators_get;
+	class->max_indicators_set = max_indicators_set;
 
 	return;
 }
@@ -342,13 +387,14 @@
 	priv->current_id = 0;
 	priv->type = NULL;
 	priv->desktop = NULL;
+	priv->count = 0;
 
 	guint i;
 	for (i = INDICATE_INTEREST_NONE; i < INDICATE_INTEREST_LAST; i++) {
 		priv->interests[i] = FALSE;
 	}
 	priv->interestedfolks = NULL;
-
+	priv->max_indicators = MAX_INDICATORS_UNSET;
 
 	return;
 }
@@ -385,54 +431,66 @@
 	g_return_if_fail(G_VALUE_HOLDS_STRING(value));
 	g_return_if_fail(id == PROP_DESKTOP || id == PROP_TYPE);
 
-	gchar ** outstr;
-	gchar * tempstr = NULL;
-	outstr = &tempstr;
-
 	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(obj);
 	switch (id) {
 	case PROP_DESKTOP:
-		outstr = &(priv->desktop);
+		if (priv->desktop != NULL) {
+			g_free(priv->desktop);
+		}
+		priv->desktop = g_value_dup_string(value);
 		break;
 	case PROP_TYPE:
-		outstr = &(priv->type);
-		break;
-	}
-
-	if (*outstr != NULL) {
-		g_free(*outstr);
-	}
-
-	*outstr = g_strdup(g_value_get_string(value));
+		if (priv->type != NULL) {
+			g_free(priv->type);
+		}
+		priv->type = g_value_dup_string(value);
+		break;
+	case PROP_COUNT: {
+		guint newval = g_value_get_uint(value);
+		if (newval != priv->count) {
+			priv->count = newval;
+			g_signal_emit(obj, signals[SERVER_COUNT_CHANGED], 0, newval, TRUE);
+		}
+		break;
+	}
+	}
 
 	return;
 }
 
+/* Gets the Gobject properties for the IndicateServer.  Mostly
+   just copies strings and a whole uint! */
 static void
 get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec)
 {
 	g_return_if_fail(id == PROP_DESKTOP || id == PROP_TYPE);
 
-	gchar * outstr = NULL;
 	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(obj);
 	switch (id) {
 	case PROP_DESKTOP:
-		outstr = priv->desktop;
+		if (priv->desktop == NULL) {
+			g_value_set_string(value, "");
+		} else {
+			g_value_set_string(value, priv->desktop);
+		}
 		break;
 	case PROP_TYPE:
-		outstr = priv->type;
-		break;
-	}
-
-	if (outstr != NULL) {
-		g_value_set_string(value, outstr);
-	} else {
-		g_value_set_static_string(value, "");
+		if (priv->type == NULL) {
+			g_value_set_string(value, "");
+		} else {
+			g_value_set_string(value, priv->type);
+		}
+		break;
+	case PROP_COUNT:
+		g_value_set_uint(value, priv->count);
+		break;
 	}
 
 	return;
 }
 
+/* Small little function to get an error quark for usage
+   with the GError errors back across DBus */
 static GQuark
 indicate_server_error_quark (void)
 {
@@ -467,8 +525,8 @@
 
 	if (!priv->registered) {
 		dbus_g_connection_register_g_object(priv->connection,
-											priv->path,
-											G_OBJECT(server));
+		                                    priv->path,
+		                                    G_OBJECT(server));
 		priv->registered = TRUE;
 	}
 
@@ -525,6 +583,10 @@
 		priv->interests[i] = FALSE;
 	}
 
+	/* Signal that we don't have a max */
+	priv->max_indicators = MAX_INDICATORS_UNSET;
+	g_signal_emit(G_OBJECT(server), signals[MAX_INDICATORS_CHANGED], 0, MAX_INDICATORS_INFINITE, TRUE);
+
 	g_signal_emit(server, signals[SERVER_HIDE], 0, priv->type ? priv->type : "", TRUE);
 
 	if (priv->dbus_proxy != NULL) {
@@ -540,6 +602,11 @@
 	return;
 }
 
+/* Watches the DBus owner change signals to see if any
+   of our folk disappear.  If one of our folks goes away
+   then it deals with the repercussions of deleting that
+   entry in terms of interest, max indicators and which
+   indicators are being displayed. */
 static void
 dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, IndicateServer * server)
 {
@@ -586,11 +653,63 @@
 		}
 	}
 
-	g_free(folk);
-
-	return;
-}
-
+	/* If the retired folk has set it's max indicators
+	   and it's the value we're using, we need to recalculate */
+	if (folk->max_indicators != MAX_INDICATORS_UNSET && folk->max_indicators == priv->max_indicators) {
+		recalculate_max_indicators(server);
+	}
+
+	g_hash_table_foreach(folk->indicators_displayed, indicator_display_check_recalc, server);
+
+	/* Finally destory everything */
+	indicate_server_interested_folks_destroy(folk);
+	return;
+}
+
+/* Checks each value in the hash table to see if it's
+   been set.  If it is, then we need to recalculate
+   the value of displayed. */
+static void
+indicator_display_check_recalc (gpointer key, gpointer value, gpointer userdata)
+{
+	if (!GPOINTER_TO_UINT(value)) {
+		return;
+	}
+
+	recalculate_indicator_displayed(INDICATE_SERVER(userdata), GPOINTER_TO_UINT(key));
+	return;
+}
+
+/* Look to see if a specific indicator ID has anyone watching
+   for it, and if not we need to set it to undisplayed. */
+static void
+recalculate_indicator_displayed (IndicateServer * server, guint id)
+{
+	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
+	GList * folkpointer;
+
+	for (folkpointer = priv->interestedfolks; folkpointer != NULL; folkpointer = g_list_next(folkpointer)) {
+		IndicateServerInterestedFolk * folk = (IndicateServerInterestedFolk *)folkpointer->data;
+		if (g_hash_table_lookup(folk->indicators_displayed, GUINT_TO_POINTER(id))) {
+			break;
+		}
+	}
+
+	if (folkpointer == NULL) {
+		/* We went through the list and no one cares about
+		   this indicator.  It's not displayed anymore. */
+		IndicateIndicator * indicator = get_indicator(server, id, NULL);
+		if (indicator != NULL) {
+			indicate_indicator_set_displayed(indicator, FALSE);
+		} else {
+			g_warning("I'm removing a displayed set from an indicator that doesn't seem to exist.");
+		}
+	}
+
+	return;
+}
+
+/* Get the next ID from the server */
 static guint
 get_next_id (IndicateServer * server)
 {
@@ -599,6 +718,10 @@
 	return priv->current_id;
 }
 
+/* Allows a listener to show interest.  First we look to see
+   if we've talked to this listener before and if so we just
+   mark their folk listing.  If it changes the overall setting
+   then we need to signal. */
 static gboolean
 show_interest (IndicateServer * server, gchar * sender, IndicateInterests interest)
 {
@@ -615,7 +738,7 @@
 	GList * entry = g_list_find_custom(priv->interestedfolks, &localfolk, indicate_server_interested_folks_equal);
 	IndicateServerInterestedFolk * folkpointer = NULL;
 	if (entry == NULL) {
-		folkpointer = g_new(IndicateServerInterestedFolk, 1);
+		folkpointer = g_new0(IndicateServerInterestedFolk, 1);
 		indicate_server_interested_folks_init(folkpointer, sender);
 		priv->interestedfolks = g_list_append(priv->interestedfolks, folkpointer);
 	} else {
@@ -631,6 +754,9 @@
 	return TRUE;
 }
 
+/* Removes an interest from a folk.  It removes it from the
+   folk structure and then checks to see if that has global
+   effect, and handles it.  */
 static gboolean
 remove_interest (IndicateServer * server, gchar * sender, IndicateInterests interest)
 {
@@ -643,18 +769,24 @@
 
 	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
 
+	/* Figure out the folk that we're talking to.  If we
+	   have an entry for them, use it, otherwise we need
+	   to create one. */
 	GList * entry = g_list_find_custom(priv->interestedfolks, &localfolk, indicate_server_interested_folks_equal);
 	IndicateServerInterestedFolk * folkpointer = NULL;
 	if (entry == NULL) {
-		folkpointer = g_new(IndicateServerInterestedFolk, 1);
+		folkpointer = g_new0(IndicateServerInterestedFolk, 1);
 		indicate_server_interested_folks_init(folkpointer, sender);
 		priv->interestedfolks = g_list_append(priv->interestedfolks, folkpointer);
 	} else {
 		folkpointer = (IndicateServerInterestedFolk *)entry->data;
 	}
 
+	/* Set the interest for this guy */
 	indicate_server_interested_folks_set(folkpointer, interest, FALSE);
 
+	/* Check to see if the interest has changed as a result of
+	   this an announce it to the world */
 	if (priv->interests[interest]) {
 		guint i;
 		for (i = INDICATE_INTEREST_NONE; i < INDICATE_INTEREST_LAST; i++) {
@@ -675,6 +807,8 @@
 	return TRUE;
 }
 
+/* Checks to see if a particular interest value is
+   set.  Uses the interest cache. */
 static gboolean
 check_interest (IndicateServer * server, IndicateInterests interest)
 {
@@ -682,12 +816,109 @@
 	return priv->interests[interest];
 }
 
+/* Internal function that can be subclassed to get
+   the value of the max number of indicators. */
+static gint
+max_indicators_get (IndicateServer * server)
+{
+	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
+	if (priv->max_indicators == MAX_INDICATORS_UNSET) {
+		return MAX_INDICATORS_INFINITE;
+	} else {
+		return priv->max_indicators;
+	}
+}
+
+/* Internal function to set the number of max indicators
+   from a particular listener. */
+static gboolean
+max_indicators_set (IndicateServer * server, gchar * sender, gint max)
+{
+	g_return_val_if_fail(max >= MAX_INDICATORS_INFINITE, FALSE);
+
+	IndicateServerInterestedFolk localfolk;
+	localfolk.sender = sender;
+
+	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
+
+	/* Figure out the folk that we're talking to.  If we
+	   have an entry for them, use it, otherwise we need
+	   to create one. */
+	GList * entry = g_list_find_custom(priv->interestedfolks, &localfolk, indicate_server_interested_folks_equal);
+	IndicateServerInterestedFolk * folkpointer = NULL;
+	if (entry == NULL) {
+		folkpointer = g_new0(IndicateServerInterestedFolk, 1);
+		indicate_server_interested_folks_init(folkpointer, sender);
+		priv->interestedfolks = g_list_append(priv->interestedfolks, folkpointer);
+	} else {
+		folkpointer = (IndicateServerInterestedFolk *)entry->data;
+	}
+
+	/* If there's a change going on... */
+	if (max != folkpointer->max_indicators) {
+		gboolean recalculate = FALSE;
+		/* If this guy is setting it to infinite or is
+                   increasing the number */
+		if ((max == -1 && priv->max_indicators != -1) || max > priv->max_indicators) {
+			recalculate = TRUE;
+		}
+
+		/* Or if potentially we were the ones setting the
+		   value for everyone */
+		if (priv->max_indicators == folkpointer->max_indicators) {
+			recalculate = TRUE;
+		}
+
+		folkpointer->max_indicators = max;
+		if (recalculate) {
+			recalculate_max_indicators(server);
+		}
+	}
+
+	return TRUE;
+}
+
+/* Look through all the folks and trying to figure out
+   what the max should be.  Signal if it changes. */
+static void
+recalculate_max_indicators (IndicateServer * server)
+{
+	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
+
+	/* Let's talk to all the folks and see what they
+	   think the max should be. */
+	GList * folkitem;
+	gint newmax = MAX_INDICATORS_UNSET;
+	for (folkitem = priv->interestedfolks; folkitem != NULL; folkitem = g_list_next(folkitem)) {
+		IndicateServerInterestedFolk * thisfolk = (IndicateServerInterestedFolk *)folkitem->data;
+		if (thisfolk->max_indicators == MAX_INDICATORS_UNSET) {
+			continue;
+		}
+		if (thisfolk->max_indicators == MAX_INDICATORS_INFINITE) {
+			newmax = MAX_INDICATORS_INFINITE;
+			break;
+		}
+		if (thisfolk->max_indicators > newmax) {
+			newmax = thisfolk->max_indicators;
+		}
+	}
+
+	/* Okay, what ever happened, now it's changing
+	   things and we need to tell everyone. */
+	if (priv->max_indicators != newmax) {
+		priv->max_indicators = newmax;
+		g_signal_emit(G_OBJECT(server), signals[MAX_INDICATORS_CHANGED], 0, newmax, TRUE);
+	}
+
+	return;
+}
+
 static void
 indicator_show_cb (IndicateIndicator * indicator, IndicateServer * server)
 {
 	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
 	priv->num_hidden--;
-	g_signal_emit(server, signals[INDICATOR_ADDED], 0, indicate_indicator_get_id(indicator), indicate_indicator_get_indicator_type(indicator), TRUE);
+	g_signal_emit(server, signals[INDICATOR_ADDED], 0, indicate_indicator_get_id(indicator), TRUE);
 	return;
 }
 
@@ -696,7 +927,7 @@
 {
 	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
 	priv->num_hidden++;
-	g_signal_emit(server, signals[INDICATOR_REMOVED], 0, indicate_indicator_get_id(indicator), indicate_indicator_get_indicator_type(indicator), TRUE);
+	g_signal_emit(server, signals[INDICATOR_REMOVED], 0, indicate_indicator_get_id(indicator), TRUE);
 	return;
 }
 
@@ -730,7 +961,7 @@
 	if (!indicate_indicator_is_visible(indicator)) {
 		priv->num_hidden++;
 	} else {
-		g_signal_emit(server, signals[INDICATOR_ADDED], 0, indicate_indicator_get_id(indicator), indicate_indicator_get_indicator_type(indicator), TRUE);
+		g_signal_emit(server, signals[INDICATOR_ADDED], 0, indicate_indicator_get_id(indicator), TRUE);
 	}
 
 	g_signal_connect(indicator, INDICATE_INDICATOR_SIGNAL_SHOW, G_CALLBACK(indicator_show_cb), server);
@@ -758,7 +989,7 @@
 
 	priv->indicators = g_slist_remove(priv->indicators, indicator);
 	if (indicate_indicator_is_visible(indicator)) {
-		g_signal_emit(server, signals[INDICATOR_REMOVED], 0, indicate_indicator_get_id(indicator), indicate_indicator_get_indicator_type(indicator), TRUE);
+		g_signal_emit(server, signals[INDICATOR_REMOVED], 0, indicate_indicator_get_id(indicator), TRUE);
 	} else {
 		priv->num_hidden--;
 	}
@@ -883,54 +1114,6 @@
 	return TRUE;
 }
 
-typedef struct {
-	gchar * type;
-	guint count;
-} count_by_t;
-
-static void
-count_by_type (IndicateIndicator * indicator, count_by_t * cbt)
-{
-	g_return_if_fail(INDICATE_IS_INDICATOR(indicator));
-	if (!indicate_indicator_is_visible(indicator)) {
-		return;
-	}
-
-	const gchar * type = indicate_indicator_get_indicator_type(indicator);
-	/* g_debug("Looking for indicator of type '%s' and have type '%s'", cbt->type, type); */
-
-	if (type == NULL && cbt->type == NULL) {
-		cbt->count++;
-	} else if (type == NULL || cbt->type == NULL) {
-	} else if (!g_strcmp0(type, cbt->type)) {
-		cbt->count++;
-	}
-
-	return;
-}
-
-static gboolean
-get_indicator_count_by_type (IndicateServer * server, gchar * type, guint * count, GError **error)
-{
-	/* g_debug("get_indicator_count_by_type: '%s'", type); */
-	count_by_t cbt;
-	cbt.type = type;
-	cbt.count = 0;
-
-	/* Handle the NULL string case as NULL itself, we're a big
-	   boy language; we have pointers. */
-	if (cbt.type != NULL && cbt.type[0] == '\0') {
-		cbt.type = NULL;
-	}
-
-	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
-
-	g_slist_foreach(priv->indicators, (GFunc)count_by_type, &cbt);
-	*count = cbt.count;
-
-	return TRUE;
-}
-
 static gboolean
 get_indicator_list (IndicateServer * server, GArray ** indicators, GError ** error)
 {
@@ -956,44 +1139,6 @@
 	return TRUE;
 }
 
-static gboolean
-get_indicator_list_by_type (IndicateServer * server, gchar * type, GArray ** indicators, GError ** error)
-{
-	g_return_val_if_fail(INDICATE_IS_SERVER(server), TRUE);
-
-	IndicateServerClass * class = INDICATE_SERVER_GET_CLASS(server);
-	g_return_val_if_fail(class->get_indicator_count != NULL, TRUE);
-
-	if (type != NULL && type[0] == '\0') {
-		type = NULL;
-	}
-
-	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
-
-	/* Can't be larger than this and it's not worth the reallocation
-	   for the small number we have.  The memory isn't worth the time. */
-	*indicators = g_array_sized_new(FALSE, FALSE, sizeof(guint), g_slist_length(priv->indicators) - priv->num_hidden);
-
-	GSList * iter;
-	int i;
-	for (iter = priv->indicators, i = 0; iter != NULL; iter = iter->next) {
-		IndicateIndicator * indicator = INDICATE_INDICATOR(iter->data);
-		if (indicate_indicator_is_visible(indicator)) {
-			const gchar * itype = indicate_indicator_get_indicator_type(indicator);
-			guint id = indicate_indicator_get_id(indicator);
-
-			if (type == NULL && itype == NULL) {
-				g_array_insert_val(*indicators, i++, id);
-			} else if (type == NULL || itype == NULL) {
-			} else if (!g_strcmp0(type, itype)) {
-				g_array_insert_val(*indicators, i++, id);
-			}
-		}
-	}
-
-	return TRUE;
-}
-
 static IndicateIndicator *
 get_indicator (IndicateServer * server, guint id, GError **error)
 {
@@ -1087,6 +1232,45 @@
 	return TRUE;
 }
 
+/* A function representing when an indicator is shown
+   to the user in some form.  First it sees if we've talked
+   to this listener before and uses that entry.  Otherwise, we
+   build one.  If we're displaying it, things are good, we can
+   just set that.  If we're not, then we need to check to see
+   if anyone else is before continuing.  */
+static gboolean
+indicator_displayed (IndicateServer * server, gchar * sender, guint id, gboolean displayed, GError ** error)
+{
+	IndicateServerInterestedFolk localfolk;
+	localfolk.sender = sender;
+
+	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
+
+	GList * entry = g_list_find_custom(priv->interestedfolks, &localfolk, indicate_server_interested_folks_equal);
+	IndicateServerInterestedFolk * folkpointer = NULL;
+	if (entry == NULL) {
+		folkpointer = g_new0(IndicateServerInterestedFolk, 1);
+		indicate_server_interested_folks_init(folkpointer, sender);
+		priv->interestedfolks = g_list_append(priv->interestedfolks, folkpointer);
+	} else {
+		folkpointer = (IndicateServerInterestedFolk *)entry->data;
+	}
+
+	g_hash_table_insert(folkpointer->indicators_displayed, GUINT_TO_POINTER(id), GUINT_TO_POINTER(displayed));
+
+	if (displayed) {
+		IndicateIndicator * indicator = get_indicator(server, id, error);
+		if (indicator == NULL) {
+			return FALSE;
+		}
+
+		indicate_indicator_set_displayed(indicator, displayed);
+	} else {
+		recalculate_indicator_displayed(server, id);
+	}
+
+	return TRUE;
+}
 
 /* Virtual Functions */
 gboolean 
@@ -1111,27 +1295,6 @@
 }
 
 gboolean 
-_indicate_server_get_indicator_count_by_type (IndicateServer * server, gchar * type, guint * count, GError **error)
-{
-	IndicateServerClass * class = INDICATE_SERVER_GET_CLASS(server);
-
-	if (class != NULL && class->get_indicator_count_by_type != NULL) {
-		return class->get_indicator_count_by_type (server, type, count, error);
-	}
-
-	if (error) {
-		g_set_error(error,
-		            indicate_server_error_quark(),
-		            NO_GET_INDICATOR_COUNT_BY_TYPE,
-		            "get_indicator_count_by_type function doesn't exist for this server class: %s",
-		            G_OBJECT_TYPE_NAME(server));
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean 
 _indicate_server_get_indicator_list (IndicateServer * server, GArray ** indicators, GError ** error)
 {
 	IndicateServerClass * class = INDICATE_SERVER_GET_CLASS(server);
@@ -1153,27 +1316,6 @@
 }
 
 gboolean 
-_indicate_server_get_indicator_list_by_type (IndicateServer * server, gchar * type, GArray ** indicators, GError ** error)
-{
-	IndicateServerClass * class = INDICATE_SERVER_GET_CLASS(server);
-
-	if (class != NULL && class->get_indicator_list_by_type != NULL) {
-		return class->get_indicator_list_by_type (server, type, indicators, error);
-	}
-
-	if (error) {
-		g_set_error(error,
-		            indicate_server_error_quark(),
-		            NO_GET_INDICATOR_LIST_BY_TYPE,
-		            "get_indicator_list_by_type function doesn't exist for this server class: %s",
-		            G_OBJECT_TYPE_NAME(server));
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gboolean 
 _indicate_server_get_indicator_property (IndicateServer * server, guint id, gchar * property, gchar ** value, GError **error)
 {
 	IndicateServerClass * class = INDICATE_SERVER_GET_CLASS(server);
@@ -1257,6 +1399,36 @@
 	return TRUE;
 }
 
+/* DBus function to wrap a virtual function call so that
+   it can be subclassed if someone so chooses */
+gboolean
+_indicate_server_indicator_displayed (IndicateServer * server, guint id, gboolean displayed, DBusGMethodInvocation * method)
+{
+	IndicateServerClass * class = INDICATE_SERVER_GET_CLASS(server);
+
+	if (class != NULL && class->indicator_displayed != NULL) {
+		GError * error = NULL;
+		if (class->indicator_displayed (server, dbus_g_method_get_sender(method), id, displayed, &error)) {
+			dbus_g_method_return(method);
+			return TRUE;
+		} else {
+			dbus_g_method_return_error(method, error);
+			g_error_free(error);
+			return FALSE;
+		}
+	}
+
+	GError * error = NULL;
+	g_set_error(&error,
+	            indicate_server_error_quark(),
+	            NO_INDICATOR_DISPLAYED,
+	            "indicator_displayed function doesn't exist for this server class: %s",
+	            G_OBJECT_TYPE_NAME(server));
+	dbus_g_method_return_error(method, error);
+	g_error_free(error);
+	return FALSE;
+}
+
 /**
 	indicate_server_get_next_id:
 	@server: The #IndicateServer the ID will be on
@@ -1316,10 +1488,10 @@
 		} else {
 			GError * error;
 			g_set_error(&error,
-						indicate_server_error_quark(),
-						SHOW_INTEREST_FAILED,
-						"Unable to show interest: %s",
-						interest);
+			            indicate_server_error_quark(),
+			            SHOW_INTEREST_FAILED,
+			            "Unable to show interest: %s",
+			            interest);
 			dbus_g_method_return_error(method, error);
 			g_error_free(error);
 			return FALSE;
@@ -1328,10 +1500,10 @@
 
 	GError * error;
 	g_set_error(&error,
-				indicate_server_error_quark(),
-				NO_SHOW_INTEREST,
-				"show_interest function doesn't exist for this server class: %s",
-				G_OBJECT_TYPE_NAME(server));
+	            indicate_server_error_quark(),
+	            NO_SHOW_INTEREST,
+	            "show_interest function doesn't exist for this server class: %s",
+	            G_OBJECT_TYPE_NAME(server));
 	dbus_g_method_return_error(method, error);
 	g_error_free(error);
 	return FALSE;
@@ -1370,6 +1542,39 @@
 	return FALSE;
 }
 
+gboolean
+_indicate_server_set_max_indicators (IndicateServer * server, gint max, DBusGMethodInvocation * method)
+{
+	IndicateServerClass * class = INDICATE_SERVER_GET_CLASS(server);
+
+	if (class != NULL && class->max_indicators_set != NULL) {
+		if (class->max_indicators_set (server, dbus_g_method_get_sender(method), max)){
+			dbus_g_method_return(method);
+			return TRUE;
+		} else {
+			GError * error;
+			g_set_error(&error,
+			            indicate_server_error_quark(),
+			            MAX_INDICATORS_SET_FAILED,
+			            "Unable to set max indicators: %d",
+			            max);
+			dbus_g_method_return_error(method, error);
+			g_error_free(error);
+			return FALSE;
+		}
+	}
+
+	GError * error;
+	g_set_error(&error,
+	            indicate_server_error_quark(),
+	            NO_MAX_INDICATORS_SET,
+	            "max_indicators_set function doesn't exist for this server class: %s",
+	            G_OBJECT_TYPE_NAME(server));
+	dbus_g_method_return_error(method, error);
+	g_error_free(error);
+	return FALSE;
+}
+
 /**
 	indicate_server_check_interest:
 	@server: The #IndicateServer being checked
@@ -1394,85 +1599,40 @@
 	return FALSE;
 }
 
-/* Signal emission functions for sub-classes of the server */
-
-/**
-	indicate_server_emit_indicator_added:
-	@server: The #IndicateServer being represented
-	@id: The ID of the indicator being added
-	@type: The type of the indicator
-
-	This function emits the #IndicateServer::indicator-added signal and is
-	used by subclasses.
-*/
-void 
-indicate_server_emit_indicator_added (IndicateServer *server, guint id, const gchar *type)
-{
-  g_return_if_fail (INDICATE_IS_SERVER (server));
-  g_return_if_fail (type);
-
-  g_signal_emit(server, signals[INDICATOR_ADDED], 0, id, type);
-}
-
-/**
-	indicate_server_emit_indicator_removed:
-	@server: The #IndicateServer being represented
-	@id: The ID of the indicator being removed
-	@type: The type of the indicator
-
-	This function emits the #IndicateServer::indicator-removed signal and is
-	used by subclasses.
-*/
-void 
-indicate_server_emit_indicator_removed (IndicateServer *server, guint id, const gchar *type)
-{
-  g_return_if_fail (INDICATE_IS_SERVER (server));
-  g_return_if_fail (type);
-
-  g_signal_emit(server, signals[INDICATOR_REMOVED], 0, id, type);
-}
-
-/**
-	indicate_server_emit_indicator_modified:
-	@server: The #IndicateServer being represented
-	@id: The ID of the indicator with the modified property
-	@property: The name of the property being modified
-
-	This function emits the #IndicateServer::indicator-modified signal and is
-	used by subclasses.
-*/
-void 
-indicate_server_emit_indicator_modified (IndicateServer *server, guint id, const gchar *property)
-{
-  g_return_if_fail (INDICATE_IS_SERVER (server));
-  g_return_if_fail (property);
-  
-  g_signal_emit(server, signals[INDICATOR_MODIFIED], 0, id, property);
-}
-
-/**
-	indicate_server_emit_server_display:
-	@server: The #IndicateServer being displayed
-
-	This function emits the #IndicateServer::server-display signal and is
-	used by subclasses.
-*/
-void 
-indicate_server_emit_server_display (IndicateServer *server)
-{
-  g_return_if_fail (INDICATE_IS_SERVER (server));
-  
-  g_signal_emit(server, signals[SERVER_DISPLAY], 0, TRUE);
+/**
+	indicate_server_get_max_indicators:
+	@server: The #IndicateServer being checked
+
+	This function looks at everyone listening and determines
+	the max number of indicators that can be shown to anyone.
+
+	Return value: A max number or -1 for unlimited.
+*/
+gint
+indicate_server_get_max_indicators (IndicateServer * server)
+{
+	IndicateServerClass * class = INDICATE_SERVER_GET_CLASS(server);
+
+	if (class != NULL && class->max_indicators_get != NULL) {
+		return class->max_indicators_get (server);
+	}
+
+	g_warning("get_max_indicators function not implemented in this server class: %s", G_OBJECT_TYPE_NAME(server));
+	return -1;
 }
 
 /* *** Folks stuff *** */
 
+/* This checks for folk by looking at the sender value
+   and sees if we can find any that have the same sender. */
 static gint
 indicate_server_interested_folks_equal (gconstpointer a, gconstpointer b)
 {
 	return g_strcmp0(((IndicateServerInterestedFolk *)a)->sender,((IndicateServerInterestedFolk *)b)->sender);
 }
 
+/* Creates a IndicateServerInterestedFolk structure and
+   initializes the default values to reasonable defaults. */
 static void
 indicate_server_interested_folks_init (IndicateServerInterestedFolk * folk, gchar * sender)
 {
@@ -1483,9 +1643,14 @@
 		folk->interests[i] = FALSE;
 	}
 
+	folk->max_indicators = MAX_INDICATORS_UNSET;
+
+	folk->indicators_displayed = g_hash_table_new(g_direct_hash, g_direct_equal);
+
 	return;
 }
 
+/* Identifies an interest in the folk. */
 static void
 indicate_server_interested_folks_set (IndicateServerInterestedFolk * folk, IndicateInterests interest, gboolean value)
 {
@@ -1493,6 +1658,8 @@
 	return;
 }
 
+/* Copies the interest table from a folk structure into a 
+   generic gboolean array of length INDICATE_INTEREST_LAST */
 static void
 indicate_server_interested_folks_copy (IndicateServerInterestedFolk * folk, gboolean * interests)
 {
@@ -1506,11 +1673,15 @@
 	return;
 }
 
+/* Destroys all the internal parts of the IndicateServerInterestedFolk
+   and then destroys the structure itself */
 static void
 indicate_server_interested_folks_destroy(IndicateServerInterestedFolk * folk)
 {
 	g_free(folk->sender);
+	g_hash_table_destroy(folk->indicators_displayed);
 	g_free(folk);
 	return;
 }
+
 /* *** End Folks *** */
 
=== modified file 'libindicate/server.h'
--- libindicate/server.h	2009-08-03 17:50:57 +0000
+++ libindicate/server.h	2009-09-08 21:57:25 +0000
@@ -47,14 +47,26 @@
 
 #define INDICATE_SERVER_INDICATOR_NULL  (0)
 
-#define INDICATE_SERVER_SIGNAL_INDICATOR_ADDED      "indicator-added"
-#define INDICATE_SERVER_SIGNAL_INDICATOR_REMOVED    "indicator-removed"
-#define INDICATE_SERVER_SIGNAL_INDICATOR_MODIFIED   "indicator-modified"
-#define INDICATE_SERVER_SIGNAL_SERVER_SHOW          "server-show"
-#define INDICATE_SERVER_SIGNAL_SERVER_HIDE          "server-hide"
-#define INDICATE_SERVER_SIGNAL_SERVER_DISPLAY       "server-display"
-#define INDICATE_SERVER_SIGNAL_INTEREST_ADDED       "interest-added"
-#define INDICATE_SERVER_SIGNAL_INTEREST_REMOVED     "interest-removed"
+#define INDICATE_SERVER_SIGNAL_INDICATOR_ADDED             "indicator-new"
+#define INDICATE_SERVER_SIGNAL_INDICATOR_ADDED_ID          (g_signal_lookup(INDICATE_SERVER_SIGNAL_INDICATOR_ADDED, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_INDICATOR_REMOVED           "indicator-delete"
+#define INDICATE_SERVER_SIGNAL_INDICATOR_REMOVED_ID        (g_signal_lookup(INDICATE_SERVER_SIGNAL_INDICATOR_REMOVED, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_INDICATOR_MODIFIED          "indicator-modified"
+#define INDICATE_SERVER_SIGNAL_INDICATOR_MODIFIED_ID       (g_signal_lookup(INDICATE_SERVER_SIGNAL_INDICATOR_MODIFIED, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_SERVER_SHOW                 "server-show"
+#define INDICATE_SERVER_SIGNAL_SERVER_SHOW_ID              (g_signal_lookup(INDICATE_SERVER_SIGNAL_SERVER_SHOW, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_SERVER_HIDE                 "server-hide"
+#define INDICATE_SERVER_SIGNAL_SERVER_HIDE_ID              (g_signal_lookup(INDICATE_SERVER_SIGNAL_SERVER_HIDE, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_SERVER_DISPLAY              "server-display"
+#define INDICATE_SERVER_SIGNAL_SERVER_DISPLAY_ID           (g_signal_lookup(INDICATE_SERVER_SIGNAL_SERVER_DISPLAY, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_INTEREST_ADDED              "interest-added"
+#define INDICATE_SERVER_SIGNAL_INTEREST_ADDED_ID           (g_signal_lookup(INDICATE_SERVER_SIGNAL_INTEREST_ADDED, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_INTEREST_REMOVED            "interest-removed"
+#define INDICATE_SERVER_SIGNAL_INTEREST_REMOVED_ID         (g_signal_lookup(INDICATE_SERVER_SIGNAL_INTEREST_REMOVED, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_MAX_INDICATORS_CHANGED      "max-indicators-changed"
+#define INDICATE_SERVER_SIGNAL_MAX_INDICATORS_CHANGED_ID   (g_signal_lookup(INDICATE_SERVER_SIGNAL_MAX_INDICATORS_CHANGED, INDICATE_TYPE_SERVER))
+#define INDICATE_SERVER_SIGNAL_SERVER_COUNT_CHANGED        "server-count-changed"
+#define INDICATE_SERVER_SIGNAL_SERVER_COUNT_CHANGED_ID     (g_signal_lookup(INDICATE_SERVER_SIGNAL_SERVER_COUNT_CHANGED, INDICATE_TYPE_SERVER))
 
 /**
 	IndicateServer:
@@ -84,13 +96,11 @@
 	@server_display: Slot for #IndicateServer::server-display.
 	@interest_added: Slot for #IndicateServer::interest-added.
 	@interest_removed: Slot for #IndicateServer::interest-removed.
+	@max_indicators_changed: Slot for #IndicateServer::max-indicators-changed.
+	@server_count_changed: Slot for #IndicateServer::server-count-changed.
 	@get_indicator_count: Returns the number of indicators that are visible
 		on the bus.  Hidden indicators should not be counted.
-	@get_indicator_count_by_type: Returns the number of indicators that are
-		of a given type and visible on the bus.
 	@get_indicator_list: List all of the indicators that are visible.
-	@get_indicator_list_by_type: List all of the indicators of a given
-		type that are visible.
 	@get_indicator_property: Get a property from a particular indicator.
 	@get_indicator_property_group: Get the values for a set of properties
 		as an array of entries, returning an array as well.
@@ -98,6 +108,8 @@
 		on a particular indicator.
 	@show_indicator_to_user: Respond to someone on the bus asking to show
 		a particular indicator to the user.
+	@indicator_displayed: An indicator has been visualized by the listener
+		or it hasn't.  This function tracks that.
 	@get_next_id: Get the next unused indicator ID.
 	@show_interest: React to someone signifying that they are interested
 		in this server.
@@ -105,6 +117,10 @@
 		server, remove it's interest.
 	@check_interest: Check to see if anyone on the bus is interested in this
 		server for a particular feature.
+	@max_indicators_set: Set the maximum number of indicators that a
+	    given listener can display.
+	@max_indicators_get: Gets the maximum number of indicators from all
+	    listeners that care about this server.
 	@indicate_server_reserved1: Reserved for future use
 	@indicate_server_reserved2: Reserved for future use
 	@indicate_server_reserved3: Reserved for future use
@@ -120,28 +136,31 @@
 	GObjectClass parent;
 
 	/* Signals */
-	void (* indicator_added) (IndicateServer * server, guint id, gchar * type);
-	void (* indicator_removed) (IndicateServer * server, guint id, gchar * type);
+	void (* indicator_added) (IndicateServer * server, guint id);
+	void (* indicator_removed) (IndicateServer * server, guint id);
 	void (* indicator_modified) (IndicateServer * server, guint id, gchar * property);
 	void (* server_show) (IndicateServer * server, gchar * type);
 	void (* server_hide) (IndicateServer * server, gchar * type);
 	void (* server_display) (IndicateServer * server);
 	void (* interest_added) (IndicateServer * server, IndicateInterests interest);
 	void (* interest_removed) (IndicateServer * server, IndicateInterests interest);
+	void (* max_indicators_changed) (IndicateServer * server, gint max);
+	void (* server_count_changed) (IndicateServer * server, guint count);
 
 	/* Virtual Functions */
 	gboolean (*get_indicator_count) (IndicateServer * server, guint * count, GError **error);
-	gboolean (*get_indicator_count_by_type) (IndicateServer * server, gchar * type, guint * count, GError **error);
 	gboolean (*get_indicator_list) (IndicateServer * server, GArray ** indicators, GError ** error);
-	gboolean (*get_indicator_list_by_type) (IndicateServer * server, gchar * type, GArray ** indicators, GError ** error);
 	gboolean (*get_indicator_property) (IndicateServer * server, guint id, gchar * property, gchar ** value, GError **error);
 	gboolean (*get_indicator_property_group) (IndicateServer * server, guint id, GPtrArray * properties, gchar *** value, GError **error);
 	gboolean (*get_indicator_properties) (IndicateServer * server, guint id, gchar *** properties, GError **error);
 	gboolean (*show_indicator_to_user) (IndicateServer * server, guint id, GError ** error);
+	gboolean (*indicator_displayed) (IndicateServer * server, gchar * sender, guint id, gboolean displayed, GError ** error);
 	guint    (*get_next_id) (IndicateServer * server);
 	gboolean (*show_interest) (IndicateServer * server, gchar * sender, IndicateInterests interest);
 	gboolean (*remove_interest) (IndicateServer * server, gchar * sender, IndicateInterests interest);
 	gboolean (*check_interest) (IndicateServer * server, IndicateInterests interest);
+	gboolean (*max_indicators_set) (IndicateServer * server, gchar * sender, gint max);
+	gint     (*max_indicators_get) (IndicateServer * server);
 
 	/* Reserver for future use */
 	void (*indicate_server_reserved1)(void);
@@ -159,6 +178,7 @@
  * out of */
 void indicate_server_set_desktop_file (IndicateServer * server, const gchar * path);
 void indicate_server_set_type (IndicateServer * server, const gchar * type);
+void indicate_server_set_count (IndicateServer * server, guint count);
 
 /* Show and hide the server on DBus, this allows for the server to
  * be created, change the object, and then shown.  If for some
@@ -176,13 +196,8 @@
 
 /* Check to see if there is someone, out there, who likes this */
 gboolean indicate_server_check_interest (IndicateServer * server, IndicateInterests interest);
-
-
-/* Signal emission functions for sub-classes of the server */
-void indicate_server_emit_indicator_added (IndicateServer *server, guint id, const gchar *type);
-void indicate_server_emit_indicator_removed (IndicateServer *server, guint id, const gchar *type);
-void indicate_server_emit_indicator_modified (IndicateServer *server, guint id, const gchar *property);
-void indicate_server_emit_server_display (IndicateServer *server);
+/* See how many indicators we can show */
+gint indicate_server_get_max_indicators (IndicateServer * server);
 
 /**
 	SECTION:server
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2009-04-27 15:48:38 +0000
+++ tests/Makefile.am	2009-09-03 22:04:01 +0000
@@ -3,7 +3,11 @@
 	test_simple \
 	test_interests \
 	test_interests_multi \
-	test_thousand_indicators
+	test_thousand_indicators \
+	test_max_indicators \
+	test_max_indicators_repeat \
+	test_indicator_display \
+	test_indicator_display_half
 
 libexec_PROGRAMS = \
 	test-interests-client \
@@ -16,7 +20,14 @@
 	test-thousand-indicators-client \
 	test-thousand-indicators-server \
 	test-simple-client \
-	test-simple-server
+	test-simple-server \
+	test-max-indicators-server-repeat \
+	test-max-indicators-server \
+	test-max-indicators-client \
+	test-indicator-display-server \
+	test-indicator-display-client \
+	test-indicator-display-half-server \
+	test-indicator-display-half-client
 
 EXTRA_DIST = \
 	$(TESTS)
@@ -139,3 +150,81 @@
 	../libindicate/libindicate.la \
 	$(LIBINDICATE_LIBS)
 
+test_max_indicators: test-max-indicators-client test-max-indicators-server
+
+test_max_indicators_client_SOURCES = \
+	test-max-indicators-client.c test-max-indicators-list.h
+
+test_max_indicators_client_CFLAGS = \
+	$(LIBINDICATE_CFLAGS) -I$(srcdir)/..
+
+test_max_indicators_client_LDADD = \
+	../libindicate/libindicate.la \
+	$(LIBINDICATE_LIBS)
+
+test_max_indicators_server_SOURCES = \
+	test-max-indicators-server.c test-max-indicators-list.h
+
+test_max_indicators_server_CFLAGS = \
+	$(LIBINDICATE_CFLAGS) -I$(srcdir)/..
+
+test_max_indicators_server_LDADD = \
+	../libindicate/libindicate.la \
+	$(LIBINDICATE_LIBS)
+
+test_max_indicators_repeat: test-max-indicators-client test-max-indicators-server-repeat
+
+test_max_indicators_server_repeat_SOURCES = \
+	test-max-indicators-server-repeat.c test-max-indicators-list.h
+
+test_max_indicators_server_repeat_CFLAGS = \
+	$(LIBINDICATE_CFLAGS) -I$(srcdir)/..
+
+test_max_indicators_server_repeat_LDADD = \
+	../libindicate/libindicate.la \
+	$(LIBINDICATE_LIBS)
+
+test_indicator_display: test-indicator-display-client test-indicator-display-server
+
+test_indicator_display_client_SOURCES = \
+	test-indicator-display-client.c
+
+test_indicator_display_client_CFLAGS = \
+	$(LIBINDICATE_CFLAGS) -I$(srcdir)/..
+
+test_indicator_display_client_LDADD = \
+	../libindicate/libindicate.la \
+	$(LIBINDICATE_LIBS)
+
+test_indicator_display_server_SOURCES = \
+	test-indicator-display-server.c
+
+test_indicator_display_server_CFLAGS = \
+	$(LIBINDICATE_CFLAGS) -I$(srcdir)/..
+
+test_indicator_display_server_LDADD = \
+	../libindicate/libindicate.la \
+	$(LIBINDICATE_LIBS)
+
+test_indicator_display_half: test-indicator-display-half-client test-indicator-display-half-server
+
+test_indicator_display_half_client_SOURCES = \
+	test-indicator-display-half-client.c
+
+test_indicator_display_half_client_CFLAGS = \
+	$(LIBINDICATE_CFLAGS) -I$(srcdir)/..
+
+test_indicator_display_half_client_LDADD = \
+	../libindicate/libindicate.la \
+	$(LIBINDICATE_LIBS)
+
+test_indicator_display_half_server_SOURCES = \
+	test-indicator-display-half-server.c
+
+test_indicator_display_half_server_CFLAGS = \
+	$(LIBINDICATE_CFLAGS) -I$(srcdir)/..
+
+test_indicator_display_half_server_LDADD = \
+	../libindicate/libindicate.la \
+	$(LIBINDICATE_LIBS)
+
 
=== added file 'tests/test-indicator-display-client.c'
--- tests/test-indicator-display-client.c	1970-01-01 00:00:00 +0000
+++ tests/test-indicator-display-client.c	2009-09-03 21:32:22 +0000
@@ -0,0 +1,64 @@
+
+#include <glib.h>
+#include "libindicate/indicator.h"
+#include "libindicate/server.h"
+#include "libindicate/interests.h"
+
+#define MAX_INDICATOR_COUNT 100
+
+static gboolean passed = TRUE;
+static GMainLoop * mainloop = NULL;
+static int count = 0;
+
+
+static void
+indicator_displayed (IndicateIndicator * indicator, gboolean displayed, gpointer user_data)
+{
+	g_debug("Indicator displayed: %s", displayed ? "true" : "false");
+	if (displayed) {
+		count++;
+	}
+
+	return;
+}
+
+static gboolean
+done_timeout_cb (gpointer data)
+{
+	g_debug("%d of %d indicators displayed", count, MAX_INDICATOR_COUNT);
+	if (count != MAX_INDICATOR_COUNT) {
+		passed = FALSE;
+	}
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+static guint indicators = 0;
+static gboolean
+idle_func (gpointer data)
+{
+	if (indicators == MAX_INDICATOR_COUNT) {
+		return FALSE;
+	}
+
+	indicators++;
+	IndicateIndicator * indicator = indicate_indicator_new();
+	g_signal_connect(G_OBJECT(indicator), INDICATE_INDICATOR_SIGNAL_DISPLAYED, G_CALLBACK(indicator_displayed), NULL);
+	indicate_indicator_show(indicator);
+
+	return TRUE;
+}
+
+int
+main (int argc, char * argv)
+{
+	g_type_init();
+
+	g_idle_add(idle_func, NULL);
+	g_timeout_add(MAX_INDICATOR_COUNT * 10, done_timeout_cb, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	return !passed;
+}
 
=== added file 'tests/test-indicator-display-half-client.c'
--- tests/test-indicator-display-half-client.c	1970-01-01 00:00:00 +0000
+++ tests/test-indicator-display-half-client.c	2009-09-03 22:01:41 +0000
@@ -0,0 +1,64 @@
+
+#include <glib.h>
+#include "libindicate/indicator.h"
+#include "libindicate/server.h"
+#include "libindicate/interests.h"
+
+#define MAX_INDICATOR_COUNT 100
+
+static gboolean passed = TRUE;
+static GMainLoop * mainloop = NULL;
+static int count = 0;
+
+
+static void
+indicator_displayed (IndicateIndicator * indicator, gboolean displayed, gpointer user_data)
+{
+	g_debug("Indicator displayed: %s", displayed ? "true" : "false");
+	if (displayed) {
+		count++;
+	}
+
+	return;
+}
+
+static gboolean
+done_timeout_cb (gpointer data)
+{
+	g_debug("%d of %d indicators displayed", count, MAX_INDICATOR_COUNT / 2);
+	if (count != MAX_INDICATOR_COUNT / 2) {
+		passed = FALSE;
+	}
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+static guint indicators = 0;
+static gboolean
+idle_func (gpointer data)
+{
+	if (indicators == MAX_INDICATOR_COUNT) {
+		return FALSE;
+	}
+
+	indicators++;
+	IndicateIndicator * indicator = indicate_indicator_new();
+	g_signal_connect(G_OBJECT(indicator), INDICATE_INDICATOR_SIGNAL_DISPLAYED, G_CALLBACK(indicator_displayed), NULL);
+	indicate_indicator_show(indicator);
+
+	return TRUE;
+}
+
+int
+main (int argc, char * argv)
+{
+	g_type_init();
+
+	g_idle_add(idle_func, NULL);
+	g_timeout_add(MAX_INDICATOR_COUNT * 10, done_timeout_cb, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	return !passed;
+}
 
=== added file 'tests/test-indicator-display-half-server.c'
--- tests/test-indicator-display-half-server.c	1970-01-01 00:00:00 +0000
+++ tests/test-indicator-display-half-server.c	2009-09-03 22:01:41 +0000
@@ -0,0 +1,55 @@
+
+#include <glib.h>
+#include "libindicate/listener.h"
+#include "test-max-indicators-list.h"
+
+static gboolean passed = TRUE;
+static GMainLoop * mainloop = NULL;
+
+gboolean doit = TRUE;
+
+static void
+indicator_added (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gpointer data)
+{
+	if (doit) {
+		indicate_listener_displayed(listener, server, indicator, TRUE);
+		doit = FALSE;
+	} else {
+		doit = TRUE;
+	}
+	return;
+}
+
+static gboolean
+failed_cb (gpointer data)
+{
+	g_debug("Done indicatating displayed");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+static void
+server_removed (void)
+{
+	g_debug("Server went away, exiting.");
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char * argv)
+{
+	g_type_init();
+
+	IndicateListener * listener = indicate_listener_ref_default();
+
+	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_INDICATOR_ADDED, G_CALLBACK(indicator_added), NULL);
+	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_SERVER_REMOVED, G_CALLBACK(server_removed), NULL);
+
+	g_timeout_add_seconds(2, failed_cb, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	return !passed;
+}
 
=== added file 'tests/test-indicator-display-server.c'
--- tests/test-indicator-display-server.c	1970-01-01 00:00:00 +0000
+++ tests/test-indicator-display-server.c	2009-09-03 21:25:30 +0000
@@ -0,0 +1,48 @@
+
+#include <glib.h>
+#include "libindicate/listener.h"
+#include "test-max-indicators-list.h"
+
+static gboolean passed = TRUE;
+static GMainLoop * mainloop = NULL;
+
+
+static void
+indicator_added (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gpointer data)
+{
+	return indicate_listener_displayed(listener, server, indicator, TRUE);
+}
+
+static gboolean
+failed_cb (gpointer data)
+{
+	g_debug("Done indicatating displayed");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+static void
+server_removed (void)
+{
+	g_debug("Server went away, exiting.");
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char * argv)
+{
+	g_type_init();
+
+	IndicateListener * listener = indicate_listener_ref_default();
+
+	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_INDICATOR_ADDED, G_CALLBACK(indicator_added), NULL);
+	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_SERVER_REMOVED, G_CALLBACK(server_removed), NULL);
+
+	g_timeout_add_seconds(2, failed_cb, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	return !passed;
+}
 
=== added file 'tests/test-max-indicators-client.c'
--- tests/test-max-indicators-client.c	1970-01-01 00:00:00 +0000
+++ tests/test-max-indicators-client.c	2009-09-03 01:47:13 +0000
@@ -0,0 +1,57 @@
+
+#include <glib.h>
+#include "libindicate/indicator.h"
+#include "libindicate/server.h"
+#include "libindicate/interests.h"
+#include "test-max-indicators-list.h"
+
+static gboolean passed = TRUE;
+static GMainLoop * mainloop = NULL;
+static int count = 0;
+
+
+static void
+max_changed (IndicateServer * server, gint max, gpointer userdata)
+{
+	g_debug("Oh, max changed: %d", max);
+
+	if (max != max_indicator_list[count]) {
+		passed = FALSE;
+		g_debug("\tBut that's not right!  We wanted: %d", max_indicator_list[count]);
+	}
+	count++;
+
+	if (count == MAX_INDICATOR_COUNT) {
+		g_main_loop_quit(mainloop);
+	}
+
+	return;
+}
+
+static gboolean
+done_timeout_cb (gpointer data)
+{
+	g_debug("All maxes not set");
+	passed = FALSE;
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+int
+main (int argc, char * argv)
+{
+	g_type_init();
+
+	IndicateIndicator * indicator = indicate_indicator_new();
+	indicate_indicator_show(indicator);
+
+	IndicateServer * server = indicate_server_ref_default();
+	g_signal_connect(G_OBJECT(server), INDICATE_SERVER_SIGNAL_MAX_INDICATORS_CHANGED, G_CALLBACK(max_changed), NULL);
+
+	g_timeout_add(MAX_INDICATOR_COUNT * 10 * 100, done_timeout_cb, indicator);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	return !passed;
+}
 
=== added file 'tests/test-max-indicators-list.h'
--- tests/test-max-indicators-list.h	1970-01-01 00:00:00 +0000
+++ tests/test-max-indicators-list.h	2009-09-03 01:37:33 +0000
@@ -0,0 +1,3 @@
+
+#define MAX_INDICATOR_COUNT 8
+gint max_indicator_list[MAX_INDICATOR_COUNT] = { 1, 0, 1000, 0, 500, 1, 7, -1 };
 
=== added file 'tests/test-max-indicators-server-repeat.c'
--- tests/test-max-indicators-server-repeat.c	1970-01-01 00:00:00 +0000
+++ tests/test-max-indicators-server-repeat.c	2009-09-03 01:50:10 +0000
@@ -0,0 +1,86 @@
+
+#include <glib.h>
+#include "libindicate/listener.h"
+#include "test-max-indicators-list.h"
+
+gint repeat_list[MAX_INDICATOR_COUNT] = { 2, 3, 1, 4, 2, 3, 1, 20 };
+
+static gboolean passed = TRUE;
+static GMainLoop * mainloop = NULL;
+
+static guint count = 0;
+static guint repeat = 0;
+
+static IndicateListener * l = NULL;
+static IndicateListenerServer * s = NULL;
+
+gboolean
+set_max (gpointer userdata)
+{
+	g_debug("Setting max indicators to: %d", max_indicator_list[count]);
+	indicate_listener_set_server_max_indicators(l, s, max_indicator_list[count]);
+	if (repeat == repeat_list[count]) {
+		count++;
+		repeat = 0;
+	} else {
+		repeat++;
+	}
+
+	if (count >= MAX_INDICATOR_COUNT) {
+		return FALSE;
+	} else {
+		return TRUE;
+	}
+}
+
+static void
+server_added (IndicateListener * listener, IndicateListenerServer * server, gchar * type, gpointer data)
+{
+	g_debug("Indicator Server Added:   %s %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server), type);
+
+	if (l != NULL || s != NULL) {
+		g_warning("Adding a second server?  %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server));
+		return;
+	}
+
+	l = listener;
+	s = server;
+
+	g_timeout_add(100, set_max, NULL);
+
+	return;
+}
+
+static gboolean
+failed_cb (gpointer data)
+{
+	g_debug("Done indicatating max indicators");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+int
+main (int argc, char * argv)
+{
+	g_type_init();
+
+	IndicateListener * listener = indicate_listener_ref_default();
+
+	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_SERVER_ADDED, G_CALLBACK(server_added), NULL);
+
+	guint i, repeat_sum = 0;
+	for (i = 0; i < MAX_INDICATOR_COUNT; i++) {
+		repeat_sum += repeat_list[i];
+	}
+
+	if (repeat_sum / MAX_INDICATOR_COUNT > 9) {
+		g_warning("Risk of client timeout.");
+	}
+
+	g_timeout_add((MAX_INDICATOR_COUNT + 4 + repeat_sum) * 100, failed_cb, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	return !passed;
+}
 
=== added file 'tests/test-max-indicators-server.c'
--- tests/test-max-indicators-server.c	1970-01-01 00:00:00 +0000
+++ tests/test-max-indicators-server.c	2009-09-03 01:50:10 +0000
@@ -0,0 +1,69 @@
+
+#include <glib.h>
+#include "libindicate/listener.h"
+#include "test-max-indicators-list.h"
+
+static gboolean passed = TRUE;
+static GMainLoop * mainloop = NULL;
+
+static guint count = 0;
+
+static IndicateListener * l = NULL;
+static IndicateListenerServer * s = NULL;
+
+gboolean
+set_max (gpointer userdata)
+{
+	g_debug("Setting max indicators to: %d", max_indicator_list[count]);
+	indicate_listener_set_server_max_indicators(l, s, max_indicator_list[count]);
+	count++;
+
+	if (count >= MAX_INDICATOR_COUNT) {
+		return FALSE;
+	} else {
+		return TRUE;
+	}
+}
+
+static void
+server_added (IndicateListener * listener, IndicateListenerServer * server, gchar * type, gpointer data)
+{
+	g_debug("Indicator Server Added:   %s %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server), type);
+
+	if (l != NULL || s != NULL) {
+		g_warning("Adding a second server?  %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server));
+		return;
+	}
+
+	l = listener;
+	s = server;
+
+	g_timeout_add(100, set_max, NULL);
+
+	return;
+}
+
+static gboolean
+failed_cb (gpointer data)
+{
+	g_debug("Done indicatating max indicators");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+int
+main (int argc, char * argv)
+{
+	g_type_init();
+
+	IndicateListener * listener = indicate_listener_ref_default();
+
+	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_SERVER_ADDED, G_CALLBACK(server_added), NULL);
+
+	g_timeout_add((MAX_INDICATOR_COUNT + 4) * 100, failed_cb, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	return !passed;
+}
 
=== added file 'tests/test_indicator_display'
--- tests/test_indicator_display	1970-01-01 00:00:00 +0000
+++ tests/test_indicator_display	2009-09-03 21:07:15 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+DBUS_RUNNER="dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf"
+
+${DBUS_RUNNER} --task ./test-indicator-display-client --task-name Client --task ./test-indicator-display-server --task-name Server
 
=== added file 'tests/test_indicator_display_half'
--- tests/test_indicator_display_half	1970-01-01 00:00:00 +0000
+++ tests/test_indicator_display_half	2009-09-03 21:58:04 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+DBUS_RUNNER="dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf"
+
+${DBUS_RUNNER} --task ./test-indicator-display-half-client --task-name Client --task ./test-indicator-display-half-server --task-name Server
 
=== added file 'tests/test_max_indicators'
--- tests/test_max_indicators	1970-01-01 00:00:00 +0000
+++ tests/test_max_indicators	2009-09-02 22:07:29 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+DBUS_RUNNER="dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf"
+
+${DBUS_RUNNER} --task ./test-max-indicators-client --task-name Client --task ./test-max-indicators-server --task-name Server
 
=== added file 'tests/test_max_indicators_repeat'
--- tests/test_max_indicators_repeat	1970-01-01 00:00:00 +0000
+++ tests/test_max_indicators_repeat	2009-09-03 01:41:31 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+DBUS_RUNNER="dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf"
+
+${DBUS_RUNNER} --task ./test-max-indicators-client --task-name Client --task ./test-max-indicators-server-repeat --task-name Server