Application Indicators

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

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 120
Proposed branch: lp:~indicator-applet-developers/indicator-application/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-application/ubuntu
Diff against target: 200 lines (+54/-15)
8 files modified
ChangeLog (+28/-0)
configure (+10/-10)
configure.ac (+2/-2)
data/ordering-override.keyfile (+3/-0)
debian/changelog (+8/-0)
docs/reference/libappindicator-docs.sgml (+1/-1)
docs/reference/version.xml (+1/-1)
src/application-service-appstore.c (+1/-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+33832@code.launchpad.net

Description of the change

0.2.6

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-08-19 18:57:51 +0000
3+++ ChangeLog 2010-08-26 19:58:42 +0000
4@@ -1,5 +1,33 @@
5 # Generated by Makefile. Do not edit.
6
7+2010-08-25 Ted Gould <ted@gould.cx>
8+
9+ Ordering i18n and keyboard indicators
10+
11+2010-08-20 Ted Gould <ted@gould.cx>
12+
13+ Handling the typo
14+
15+2010-08-20 Ted Gould <ted@gould.cx>
16+
17+ Adding keyboard and ibus to overrides
18+
19+2010-08-25 Ted Gould <ted@gould.cx>
20+
21+ Putting new icons in the right place
22+
23+2010-08-20 Ted Gould <ted@gould.cx>
24+
25+ Get the proper position for an application when it becomes visible.
26+
27+2010-08-19 Ted Gould <ted@gould.cx>
28+
29+ 0.2.5
30+
31+2010-08-19 Ted Gould <ted@gould.cx>
32+
33+ Fix approver for function change
34+
35 2010-08-19 Ted Gould <ted@gould.cx>
36
37 Adding a signal for approvers to be able to change their mind
38
39=== modified file 'configure'
40--- configure 2010-08-19 18:58:41 +0000
41+++ configure 2010-08-26 19:58:42 +0000
42@@ -1,6 +1,6 @@
43 #! /bin/sh
44 # Guess values for system-dependent variables and create Makefiles.
45-# Generated by GNU Autoconf 2.67 for indicator-application 0.2.5.
46+# Generated by GNU Autoconf 2.67 for indicator-application 0.2.6.
47 #
48 # Report bugs to <ted@canonical.com>.
49 #
50@@ -703,8 +703,8 @@
51 # Identity of this package.
52 PACKAGE_NAME='indicator-application'
53 PACKAGE_TARNAME='indicator-application'
54-PACKAGE_VERSION='0.2.5'
55-PACKAGE_STRING='indicator-application 0.2.5'
56+PACKAGE_VERSION='0.2.6'
57+PACKAGE_STRING='indicator-application 0.2.6'
58 PACKAGE_BUGREPORT='ted@canonical.com'
59 PACKAGE_URL=''
60
61@@ -1510,7 +1510,7 @@
62 # Omit some internal or obsolete options to make the list less imposing.
63 # This message is too long to be a string in the A/UX 3.1 sh.
64 cat <<_ACEOF
65-\`configure' configures indicator-application 0.2.5 to adapt to many kinds of systems.
66+\`configure' configures indicator-application 0.2.6 to adapt to many kinds of systems.
67
68 Usage: $0 [OPTION]... [VAR=VALUE]...
69
70@@ -1581,7 +1581,7 @@
71
72 if test -n "$ac_init_help"; then
73 case $ac_init_help in
74- short | recursive ) echo "Configuration of indicator-application 0.2.5:";;
75+ short | recursive ) echo "Configuration of indicator-application 0.2.6:";;
76 esac
77 cat <<\_ACEOF
78
79@@ -1718,7 +1718,7 @@
80 test -n "$ac_init_help" && exit $ac_status
81 if $ac_init_version; then
82 cat <<\_ACEOF
83-indicator-application configure 0.2.5
84+indicator-application configure 0.2.6
85 generated by GNU Autoconf 2.67
86
87 Copyright (C) 2010 Free Software Foundation, Inc.
88@@ -1998,7 +1998,7 @@
89 This file contains any messages produced by compilers while
90 running configure, to aid debugging if configure makes a mistake.
91
92-It was created by indicator-application $as_me 0.2.5, which was
93+It was created by indicator-application $as_me 0.2.6, which was
94 generated by GNU Autoconf 2.67. Invocation command line was
95
96 $ $0 $@
97@@ -2819,7 +2819,7 @@
98
99 # Define the identity of the package.
100 PACKAGE=indicator-application
101- VERSION=0.2.5
102+ VERSION=0.2.6
103
104
105 cat >>confdefs.h <<_ACEOF
106@@ -13695,7 +13695,7 @@
107 # report actual input values of CONFIG_FILES etc. instead of their
108 # values after options handling.
109 ac_log="
110-This file was extended by indicator-application $as_me 0.2.5, which was
111+This file was extended by indicator-application $as_me 0.2.6, which was
112 generated by GNU Autoconf 2.67. Invocation command line was
113
114 CONFIG_FILES = $CONFIG_FILES
115@@ -13761,7 +13761,7 @@
116 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
117 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
118 ac_cs_version="\\
119-indicator-application config.status 0.2.5
120+indicator-application config.status 0.2.6
121 configured by $0, generated by GNU Autoconf 2.67,
122 with options \\"\$ac_cs_config\\"
123
124
125=== modified file 'configure.ac'
126--- configure.ac 2010-08-19 18:56:53 +0000
127+++ configure.ac 2010-08-26 19:58:42 +0000
128@@ -1,11 +1,11 @@
129
130-AC_INIT(indicator-application, 0.2.5, ted@canonical.com)
131+AC_INIT(indicator-application, 0.2.6, ted@canonical.com)
132 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
133
134 AC_PREREQ(2.53)
135
136 AM_CONFIG_HEADER(config.h)
137-AM_INIT_AUTOMAKE(indicator-application, 0.2.5)
138+AM_INIT_AUTOMAKE(indicator-application, 0.2.6)
139
140 AM_MAINTAINER_MODE
141
142
143=== modified file 'data/ordering-override.keyfile'
144--- data/ordering-override.keyfile 2010-08-11 14:06:41 +0000
145+++ data/ordering-override.keyfile 2010-08-26 19:58:42 +0000
146@@ -1,2 +1,5 @@
147 [Ordering Index Overrides]
148 gnome-power-manager=1
149+gst-keyboard-xkb=2
150+gsd-keyboard-xkb=3
151+ibus=4
152
153=== modified file 'debian/changelog'
154--- debian/changelog 2010-08-19 20:18:05 +0000
155+++ debian/changelog 2010-08-26 19:58:42 +0000
156@@ -1,3 +1,11 @@
157+indicator-application (0.2.6-0ubuntu1~ppa1) maverick; urgency=low
158+
159+ * New upstream release.
160+ * Fixing the position of new indicators (LP: #623205)
161+ * Position the ibus and keyboard layout indicators correctly.
162+
163+ -- Ted Gould <ted@ubuntu.com> Thu, 26 Aug 2010 14:56:27 -0500
164+
165 indicator-application (0.2.5-0ubuntu1) maverick; urgency=low
166
167 * New upstream release.
168
169=== modified file 'docs/reference/libappindicator-docs.sgml'
170--- docs/reference/libappindicator-docs.sgml 2010-08-19 18:57:51 +0000
171+++ docs/reference/libappindicator-docs.sgml 2010-08-26 19:58:42 +0000
172@@ -8,7 +8,7 @@
173 <bookinfo>
174 <title>libappindicator Reference Manual</title>
175 <releaseinfo>
176- for libappindicator 0.2.5
177+ for libappindicator 0.2.6
178 </releaseinfo>
179 </bookinfo>
180
181
182=== modified file 'docs/reference/version.xml'
183--- docs/reference/version.xml 2010-08-19 18:57:51 +0000
184+++ docs/reference/version.xml 2010-08-26 19:58:42 +0000
185@@ -1,1 +1,1 @@
186-0.2.5
187+0.2.6
188
189=== modified file 'src/application-service-appstore.c'
190--- src/application-service-appstore.c 2010-08-19 14:59:09 +0000
191+++ src/application-service-appstore.c 2010-08-26 19:58:42 +0000
192@@ -621,7 +621,7 @@
193 g_signal_emit(G_OBJECT(app->appstore),
194 signals[APPLICATION_ADDED], 0,
195 newicon,
196- g_list_index(priv->applications, app), /* Position */
197+ get_position(app), /* Position */
198 app->dbus_name,
199 app->menu,
200 app->icon_theme_path,

Subscribers

People subscribed via source and target branches

to all changes: