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

Proposed by Ted Gould
Status: Merged
Merged at revision: 122
Proposed branch: lp:~indicator-applet-developers/indicator-application/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-application/ubuntu
Diff against target: 179 lines (+41/-15)
7 files modified
ChangeLog (+12/-0)
configure (+10/-10)
configure.ac (+2/-2)
debian/changelog (+7/-0)
docs/reference/libappindicator-docs.sgml (+1/-1)
docs/reference/version.xml (+1/-1)
src/application-service-appstore.c (+8/-1)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-application/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+35584@code.launchpad.net

Description of the change

0.2.8

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2010-09-09 17:54:08 +0000
3+++ ChangeLog 2010-09-15 20:22:45 +0000
4@@ -1,5 +1,17 @@
5 # Generated by Makefile. Do not edit.
6
7+2010-09-15 Ted Gould <ted@gould.cx>
8+
9+ Making it when we see changes we always update the icon.
10+
11+2010-09-15 Ted Gould <ted@gould.cx>
12+
13+ Allowing updates if the item is visible.
14+
15+2010-09-09 Ted Gould <ted@gould.cx>
16+
17+ 0.2.7
18+
19 2010-09-09 Ted Gould <ted@gould.cx>
20
21 Handle double registration of indicators.
22
23=== modified file 'configure'
24--- configure 2010-09-09 17:55:58 +0000
25+++ configure 2010-09-15 20:22:45 +0000
26@@ -1,6 +1,6 @@
27 #! /bin/sh
28 # Guess values for system-dependent variables and create Makefiles.
29-# Generated by GNU Autoconf 2.67 for indicator-application 0.2.7.
30+# Generated by GNU Autoconf 2.67 for indicator-application 0.2.8.
31 #
32 # Report bugs to <ted@canonical.com>.
33 #
34@@ -703,8 +703,8 @@
35 # Identity of this package.
36 PACKAGE_NAME='indicator-application'
37 PACKAGE_TARNAME='indicator-application'
38-PACKAGE_VERSION='0.2.7'
39-PACKAGE_STRING='indicator-application 0.2.7'
40+PACKAGE_VERSION='0.2.8'
41+PACKAGE_STRING='indicator-application 0.2.8'
42 PACKAGE_BUGREPORT='ted@canonical.com'
43 PACKAGE_URL=''
44
45@@ -1510,7 +1510,7 @@
46 # Omit some internal or obsolete options to make the list less imposing.
47 # This message is too long to be a string in the A/UX 3.1 sh.
48 cat <<_ACEOF
49-\`configure' configures indicator-application 0.2.7 to adapt to many kinds of systems.
50+\`configure' configures indicator-application 0.2.8 to adapt to many kinds of systems.
51
52 Usage: $0 [OPTION]... [VAR=VALUE]...
53
54@@ -1581,7 +1581,7 @@
55
56 if test -n "$ac_init_help"; then
57 case $ac_init_help in
58- short | recursive ) echo "Configuration of indicator-application 0.2.7:";;
59+ short | recursive ) echo "Configuration of indicator-application 0.2.8:";;
60 esac
61 cat <<\_ACEOF
62
63@@ -1718,7 +1718,7 @@
64 test -n "$ac_init_help" && exit $ac_status
65 if $ac_init_version; then
66 cat <<\_ACEOF
67-indicator-application configure 0.2.7
68+indicator-application configure 0.2.8
69 generated by GNU Autoconf 2.67
70
71 Copyright (C) 2010 Free Software Foundation, Inc.
72@@ -1998,7 +1998,7 @@
73 This file contains any messages produced by compilers while
74 running configure, to aid debugging if configure makes a mistake.
75
76-It was created by indicator-application $as_me 0.2.7, which was
77+It was created by indicator-application $as_me 0.2.8, which was
78 generated by GNU Autoconf 2.67. Invocation command line was
79
80 $ $0 $@
81@@ -2819,7 +2819,7 @@
82
83 # Define the identity of the package.
84 PACKAGE=indicator-application
85- VERSION=0.2.7
86+ VERSION=0.2.8
87
88
89 cat >>confdefs.h <<_ACEOF
90@@ -13695,7 +13695,7 @@
91 # report actual input values of CONFIG_FILES etc. instead of their
92 # values after options handling.
93 ac_log="
94-This file was extended by indicator-application $as_me 0.2.7, which was
95+This file was extended by indicator-application $as_me 0.2.8, which was
96 generated by GNU Autoconf 2.67. Invocation command line was
97
98 CONFIG_FILES = $CONFIG_FILES
99@@ -13761,7 +13761,7 @@
100 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
101 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
102 ac_cs_version="\\
103-indicator-application config.status 0.2.7
104+indicator-application config.status 0.2.8
105 configured by $0, generated by GNU Autoconf 2.67,
106 with options \\"\$ac_cs_config\\"
107
108
109=== modified file 'configure.ac'
110--- configure.ac 2010-09-09 17:52:35 +0000
111+++ configure.ac 2010-09-15 20:22:45 +0000
112@@ -1,11 +1,11 @@
113
114-AC_INIT(indicator-application, 0.2.7, ted@canonical.com)
115+AC_INIT(indicator-application, 0.2.8, ted@canonical.com)
116 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
117
118 AC_PREREQ(2.53)
119
120 AM_CONFIG_HEADER(config.h)
121-AM_INIT_AUTOMAKE(indicator-application, 0.2.7)
122+AM_INIT_AUTOMAKE(indicator-application, 0.2.8)
123
124 AM_MAINTAINER_MODE
125
126
127=== modified file 'debian/changelog'
128--- debian/changelog 2010-09-09 20:36:24 +0000
129+++ debian/changelog 2010-09-15 20:22:45 +0000
130@@ -1,3 +1,10 @@
131+indicator-application (0.2.8-0ubuntu1~ppa1) maverick; urgency=low
132+
133+ * New upstream release.
134+ * Update the icon if the item is visible (LP: #639643)
135+
136+ -- Ted Gould <ted@ubuntu.com> Wed, 15 Sep 2010 15:05:15 -0500
137+
138 indicator-application (0.2.7-0ubuntu1) maverick; urgency=low
139
140 * New upstream release.
141
142=== modified file 'docs/reference/libappindicator-docs.sgml'
143--- docs/reference/libappindicator-docs.sgml 2010-09-09 17:54:08 +0000
144+++ docs/reference/libappindicator-docs.sgml 2010-09-15 20:22:45 +0000
145@@ -8,7 +8,7 @@
146 <bookinfo>
147 <title>libappindicator Reference Manual</title>
148 <releaseinfo>
149- for libappindicator 0.2.7
150+ for libappindicator 0.2.8
151 </releaseinfo>
152 </bookinfo>
153
154
155=== modified file 'docs/reference/version.xml'
156--- docs/reference/version.xml 2010-09-09 17:54:08 +0000
157+++ docs/reference/version.xml 2010-09-15 20:22:45 +0000
158@@ -1,1 +1,1 @@
159-0.2.7
160+0.2.8
161
162=== modified file 'src/application-service-appstore.c'
163--- src/application-service-appstore.c 2010-09-09 17:55:58 +0000
164+++ src/application-service-appstore.c 2010-09-15 20:22:45 +0000
165@@ -602,7 +602,14 @@
166 }
167
168 /* Nothing needs to change, we're good */
169- if (app->visible_state == goal_state) {
170+ if (app->visible_state == goal_state /* ) { */
171+ && goal_state == VISIBLE_STATE_HIDDEN) {
172+ /* TODO: Uhg, this is a little wrong in that we're going to
173+ send an icon every time the status changes and the indicator
174+ is visible even though it might not be updating. But, at
175+ this point we need a small patch that is harmless. In the
176+ future we need to track which icon is shown and remove the
177+ duplicate message. */
178 return;
179 }
180

Subscribers

People subscribed via source and target branches

to all changes: