Application Indicators

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

  1. lucid
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~indicator-applet-developers/indicator-application/lucid
Merge into: lp:~ubuntu-desktop/indicator-application/ubuntu
Diff against target: 130 lines (+46/-3)
5 files modified
.bzrignore (+8/-1)
bindings/mono/libappindicator-api.metadata (+4/-0)
configure.ac (+2/-2)
debian/changelog (+21/-0)
src/libappindicator/app-indicator.c (+11/-0)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-application/lucid
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+20178@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

0.0.14

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-02-06 01:30:10 +0000
3+++ .bzrignore 2010-02-25 21:25:22 +0000
4@@ -1,6 +1,5 @@
5 data/indicator-application.service
6 compile
7-indicator-application-[0-9].[0-9].[0-9].tar.gz
8 m4/
9 src/indicator-application-service
10 src/libappindicator.la
11@@ -93,3 +92,11 @@
12 tests/test-libappindicator-status
13 tests/test-libappindicator-status-client
14 tests/test-libappindicator-status-server
15+bindings/mono/AppIndicator.Test.dll
16+bindings/mono/libappindicator-api.middle
17+bindings/mono/examples/IndicatorExample.exe
18+src/libappindicator/app-indicator-enum-types.gen.c
19+indicator-application-[0-9].[0-9].[0-9].tar.gz
20+indicator-application-[0-9].[0-9].[0-9].tar.gz.asc
21+indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz
22+indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz.asc
23
24=== modified file 'bindings/mono/libappindicator-api.metadata'
25--- bindings/mono/libappindicator-api.metadata 2010-01-12 04:59:17 +0000
26+++ bindings/mono/libappindicator-api.metadata 2010-02-25 21:25:22 +0000
27@@ -2,9 +2,13 @@
28 <metadata>
29 <attr path="/api/namespace/object[@cname='AppIndicator']" name="name">ApplicationIndicator</attr>
30 <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="name">NewAttentionIcon</attr>
31+ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="cname">new-attention-icon</attr>
32 <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="name">NewStatus</attr>
33+ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="cname">new-status</attr>
34 <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="name">ConnectionChanged</attr>
35+ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="cname">connection-changed</attr>
36 <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr>
37+ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="cname">new-icon</attr>
38 <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='id']" name="name">ID</attr>
39 <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr>
40 <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr>
41
42=== modified file 'configure.ac'
43--- configure.ac 2010-02-23 16:26:10 +0000
44+++ configure.ac 2010-02-25 21:25:22 +0000
45@@ -1,11 +1,11 @@
46
47-AC_INIT(indicator-application, 0.0.13, ted@canonical.com)
48+AC_INIT(indicator-application, 0.0.14, ted@canonical.com)
49 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
50
51 AC_PREREQ(2.53)
52
53 AM_CONFIG_HEADER(config.h)
54-AM_INIT_AUTOMAKE(indicator-application, 0.0.13)
55+AM_INIT_AUTOMAKE(indicator-application, 0.0.14)
56
57 AM_MAINTAINER_MODE
58
59
60=== modified file 'debian/changelog'
61--- debian/changelog 2010-02-23 16:52:35 +0000
62+++ debian/changelog 2010-02-25 21:25:22 +0000
63@@ -1,3 +1,24 @@
64+indicator-application (0.0.14-0ubuntu1~ppa1) lucid; urgency=low
65+
66+ * Upstream release 0.0.14
67+ ∘ Fix mono bindings to include proper metadata (LP: #526620)
68+ ∘ Send connection changed signal when the proxy is created
69+ and destroyed (LP: #527082)
70+ ∘ Hide the fallback status icon before unrefing it. (LP: #526041)
71+ ∘ Increase dbus-glib version check to 0.82
72+ ∘ Handle menu layout changes and visibility changes better.
73+ ∘ Improve testing stability
74+ ∘ Read menu sensitivity on startup.
75+ ∘ Handle null strings when evaluating whether we have an
76+ attention icon.
77+ ∘ Remove dbus objects when we fallback
78+ ∘ Disconnect client_menu_changed signal handlers on cleanup.
79+ ∘ Handle cases where the menu gets unset on updates.
80+ ∘ Fix custom labels on stock items.
81+ ∘ Adds support for submenus
82+
83+ -- Ted Gould <ted@ubuntu.com> Thu, 25 Feb 2010 15:22:28 -0600
84+
85 indicator-application (0.0.13-0ubuntu8) lucid; urgency=low
86
87 * Upstream Merge
88
89=== modified file 'src/libappindicator/app-indicator.c'
90--- src/libappindicator/app-indicator.c 2010-02-23 15:52:09 +0000
91+++ src/libappindicator/app-indicator.c 2010-02-25 21:25:22 +0000
92@@ -387,6 +387,9 @@
93 g_signal_handlers_disconnect_by_func(G_OBJECT(priv->watcher_proxy), watcher_proxy_destroyed, self);
94 g_object_unref(G_OBJECT(priv->watcher_proxy));
95 priv->watcher_proxy = NULL;
96+
97+ /* Emit the AppIndicator::connection-changed signal*/
98+ g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
99 }
100
101 if (priv->connection != NULL) {
102@@ -625,6 +628,9 @@
103 org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, path, register_service_cb, self);
104 g_free(path);
105
106+ /* Emit the AppIndicator::connection-changed signal*/
107+ g_signal_emit (self, signals[CONNECTION_CHANGED], 0, TRUE);
108+
109 return;
110 }
111
112@@ -639,6 +645,10 @@
113 dbus_g_connection_unregister_g_object(self->priv->connection,
114 G_OBJECT(self));
115 self->priv->watcher_proxy = NULL;
116+
117+ /* Emit the AppIndicator::connection-changed signal*/
118+ g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
119+
120 start_fallback_timer(self, FALSE);
121 return;
122 }
123@@ -885,6 +895,7 @@
124 {
125 g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_status_wrapper, status_icon);
126 g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_changes, status_icon);
127+ gtk_widget_hide(GTK_WIDGET(status_icon));
128 g_object_unref(G_OBJECT(status_icon));
129 return;
130 }

Subscribers

People subscribed via source and target branches

to all changes: