Merge from trunk

6 files changed, 68 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 7558022..712ea42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+indicator-applet (0.1~ppa21) intrepid; urgency=low
+
+  * Adding in package fixes from seb128
+    * Removing scrollkeeper
+    * Changing libindicate to libindicate0
+    * Removing .la file
+    * Removing targets for files in libindcate-dev.install
+    * Removing pkg-create-dbgsym
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 03 Feb 2009 11:34:02 +0100
+
+indicator-applet (0.1~ppa20) intrepid; urgency=low
+
+  * Adding a build depend on pkg-create-dbgsym
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 02 Feb 2009 13:38:05 +0100
+
+indicator-applet (0.1~ppa19) intrepid; urgency=low
+
+  * Bump for PPA
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 02 Feb 2009 10:43:32 +0100
+
+indicator-applet (0.1~ppa18) intrepid; urgency=low
+
+  * Adding interface for listener sending back a display
+    request.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 30 Jan 2009 15:06:47 -0600
+
 indicator-applet (0.1~ppa17) intrepid; urgency=low
 
   * Fixing the handling of named DBus connections
diff --git a/debian/control b/debian/control
index 2b47abf..9d04325 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 5.0),
                libpanel-applet2-dev (>= 2.0.0),
                libdbus-glib-1-dev,
                gnome-doc-utils,
-               scrollkeeper,
                libtool,
                intltool,
                gobject-introspection (>= 0.6),
@@ -24,7 +23,7 @@ Depends: ${shlibs:Depends},
 Description: Applet for the GNOME panel providing various indicators for
  display to users.
 
-Package: libindicate
+Package: libindicate0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -36,7 +35,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicate (= ${binary:Version}),
+         libindicate0 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
 Description: Development files.
diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install
index 76e63d7..4623919 100644
--- a/debian/libindicate-dev.install
+++ b/debian/libindicate-dev.install
@@ -1,5 +1,4 @@
-debian/tmp/usr/include/ usr/
-debian/tmp/usr/lib/pkgconfig usr/lib/
-debian/tmp/usr/lib/libindicate.a usr/lib/
-debian/tmp/usr/lib/libindicate.la usr/lib/
-debian/tmp/usr/lib/libindicate.so usr/lib/
+debian/tmp/usr/include/
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libindicate.a
+debian/tmp/usr/lib/libindicate.so
diff --git a/debian/libindicate.install b/debian/libindicate0.install
index a83aa8a..a83aa8a 100644
--- a/debian/libindicate.install
+++ b/debian/libindicate0.install
diff --git a/libindicate/server.c b/libindicate/server.c
index cd35871..ab64304 100644
--- a/libindicate/server.c
+++ b/libindicate/server.c
@@ -705,3 +705,30 @@ indicate_server_get_next_id (IndicateServer * server)
 	return 0;
 }
 
+/* Signal emission functions for sub-classes of the server */
+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);
+}
+
+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);
+}
+
+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);
+}
diff --git a/libindicate/server.h b/libindicate/server.h
index 482fb9a..eccf3c6 100644
--- a/libindicate/server.h
+++ b/libindicate/server.h
@@ -81,6 +81,11 @@ gboolean indicate_server_get_indicator_property_group (IndicateServer * server,
 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);
 
+/* 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);
+
 G_END_DECLS
 
 #endif /* INDICATE_SERVER_H_INCLUDED__ */