aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore9
-rw-r--r--bindings/mono/libappindicator-api.metadata4
-rw-r--r--configure.ac4
-rw-r--r--debian/changelog21
-rw-r--r--src/libappindicator/app-indicator.c11
5 files changed, 46 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore
index 24a0402..0f2b3d0 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,6 +1,5 @@
data/indicator-application.service
compile
-indicator-application-[0-9].[0-9].[0-9].tar.gz
m4/
src/indicator-application-service
src/libappindicator.la
@@ -93,3 +92,11 @@ tests/test-libappindicator-fallback
tests/test-libappindicator-status
tests/test-libappindicator-status-client
tests/test-libappindicator-status-server
+bindings/mono/AppIndicator.Test.dll
+bindings/mono/libappindicator-api.middle
+bindings/mono/examples/IndicatorExample.exe
+src/libappindicator/app-indicator-enum-types.gen.c
+indicator-application-[0-9].[0-9].[0-9].tar.gz
+indicator-application-[0-9].[0-9].[0-9].tar.gz.asc
+indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz
+indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz.asc
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index 86f0f26..c94cc5b 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -2,9 +2,13 @@
<metadata>
<attr path="/api/namespace/object[@cname='AppIndicator']" name="name">ApplicationIndicator</attr>
<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="name">NewAttentionIcon</attr>
+ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="cname">new-attention-icon</attr>
<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="name">NewStatus</attr>
+ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="cname">new-status</attr>
<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="name">ConnectionChanged</attr>
+ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="cname">connection-changed</attr>
<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr>
+ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="cname">new-icon</attr>
<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='id']" name="name">ID</attr>
<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr>
<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr>
diff --git a/configure.ac b/configure.ac
index a3c26e5..219a08e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.13, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.14, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.13)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.14)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 97e82fe..053c781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+indicator-application (0.0.14-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+ * Upstream release 0.0.14
+ ∘ Fix mono bindings to include proper metadata (LP: #526620)
+ ∘ Send connection changed signal when the proxy is created
+ and destroyed (LP: #527082)
+ ∘ Hide the fallback status icon before unrefing it. (LP: #526041)
+ ∘ Increase dbus-glib version check to 0.82
+ ∘ Handle menu layout changes and visibility changes better.
+ ∘ Improve testing stability
+ ∘ Read menu sensitivity on startup.
+ ∘ Handle null strings when evaluating whether we have an
+ attention icon.
+ ∘ Remove dbus objects when we fallback
+ ∘ Disconnect client_menu_changed signal handlers on cleanup.
+ ∘ Handle cases where the menu gets unset on updates.
+ ∘ Fix custom labels on stock items.
+ ∘ Adds support for submenus
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 25 Feb 2010 15:16:38 -0600
+
indicator-application (0.0.13-0ubuntu8) lucid; urgency=low
* Upstream Merge
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 7c1ac82..1796e8e 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -387,6 +387,9 @@ app_indicator_dispose (GObject *object)
g_signal_handlers_disconnect_by_func(G_OBJECT(priv->watcher_proxy), watcher_proxy_destroyed, self);
g_object_unref(G_OBJECT(priv->watcher_proxy));
priv->watcher_proxy = NULL;
+
+ /* Emit the AppIndicator::connection-changed signal*/
+ g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
}
if (priv->connection != NULL) {
@@ -625,6 +628,9 @@ check_connect (AppIndicator *self)
org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, path, register_service_cb, self);
g_free(path);
+ /* Emit the AppIndicator::connection-changed signal*/
+ g_signal_emit (self, signals[CONNECTION_CHANGED], 0, TRUE);
+
return;
}
@@ -639,6 +645,10 @@ watcher_proxy_destroyed (GObject * object, gpointer data)
dbus_g_connection_unregister_g_object(self->priv->connection,
G_OBJECT(self));
self->priv->watcher_proxy = NULL;
+
+ /* Emit the AppIndicator::connection-changed signal*/
+ g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
+
start_fallback_timer(self, FALSE);
return;
}
@@ -885,6 +895,7 @@ unfallback (AppIndicator * self, GtkStatusIcon * status_icon)
{
g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_status_wrapper, status_icon);
g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_changes, status_icon);
+ gtk_widget_hide(GTK_WIDGET(status_icon));
g_object_unref(G_OBJECT(status_icon));
return;
}