Merge lp:~indicator-applet-developers/ubuntu/precise/libindicator/upstream into lp:~ubuntu-desktop/libindicator/ubuntu
- Precise (12.04)
- upstream
- Merge into ubuntu
Proposed by
Ted Gould
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Pending | ||
Ken VanDine | Pending | ||
Review via email: mp+96447@code.launchpad.net |
Commit message
Description of the change
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 2012-02-23 11:28:01 +0000 | |||
3 | +++ ChangeLog 2012-03-07 20:18:33 +0000 | |||
4 | @@ -1,5 +1,79 @@ | |||
5 | 1 | # Generated by Makefile. Do not edit. | 1 | # Generated by Makefile. Do not edit. |
6 | 2 | 2 | ||
7 | 3 | 2012-03-07 Ted Gould <ted@gould.cx> | ||
8 | 4 | |||
9 | 5 | 0.4.93 | ||
10 | 6 | |||
11 | 7 | 2012-03-05 Charles Kerr <charles.kerr@canonical.com> | ||
12 | 8 | |||
13 | 9 | merge lp:~ted/libindicator/lp719457 for Bug #719457 | ||
14 | 10 | |||
15 | 11 | 2012-03-02 Ted Gould <ted@gould.cx> | ||
16 | 12 | |||
17 | 13 | Attaching bug | ||
18 | 14 | |||
19 | 15 | 2012-03-02 Ted Gould <ted@gould.cx> | ||
20 | 16 | |||
21 | 17 | Copying the name before using it to remove as it seems that the unwatch can cause the name to be free'd in some cases. Odd, but valgrind can find it | ||
22 | 18 | |||
23 | 19 | 2012-03-02 Ted Gould <ted@gould.cx> | ||
24 | 20 | |||
25 | 21 | Support new FD.o Desktop Actions | ||
26 | 22 | |||
27 | 23 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
28 | 24 | |||
29 | 25 | Get the right group in exec too! | ||
30 | 26 | |||
31 | 27 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
32 | 28 | |||
33 | 29 | Handling the different group names when getting the name as well | ||
34 | 30 | |||
35 | 31 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
36 | 32 | |||
37 | 33 | Update test desktop file | ||
38 | 34 | |||
39 | 35 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
40 | 36 | |||
41 | 37 | Creating a warning for the legacy support | ||
42 | 38 | |||
43 | 39 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
44 | 40 | |||
45 | 41 | Adding a value for whether it should use the TargetEnvironment, I'm removing the warning because we don't care to fix old stuff anymore | ||
46 | 42 | |||
47 | 43 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
48 | 44 | |||
49 | 45 | Use the appropriate list of nicks and groups to find our data now | ||
50 | 46 | |||
51 | 47 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
52 | 48 | |||
53 | 49 | Figure out what kind of actions we have | ||
54 | 50 | |||
55 | 51 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
56 | 52 | |||
57 | 53 | Adding a state variable to track what kind of actions we have | ||
58 | 54 | |||
59 | 55 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
60 | 56 | |||
61 | 57 | Attaching bug | ||
62 | 58 | |||
63 | 59 | 2012-02-27 Ted Gould <ted@gould.cx> | ||
64 | 60 | |||
65 | 61 | Changing our defines around to make sure to mark things the way that we think about them. | ||
66 | 62 | |||
67 | 63 | 2012-02-29 Charles Kerr <charles.kerr@canonical.com> | ||
68 | 64 | |||
69 | 65 | lp:~charlesk/libindicator/fix-939061 | ||
70 | 66 | |||
71 | 67 | 2012-02-29 Charles Kerr <charles.kerr@canonical.com> | ||
72 | 68 | |||
73 | 69 | silence Coverity warning "PW.BRANCH_PAST_INITIALIZATION - CID 10615" reported in Bug #939061 | ||
74 | 70 | |||
75 | 71 | Coverity is unhappy that the local variable "priv" is uninitialized if one of the goto branches is followed in this function. Since we only use priv once, a fairly clean way of sidestepping this warning is removing the local variable "priv" and instead using INDICATOR_OBJECT_GET_PRIVATE()'s return pointer directly. | ||
76 | 72 | |||
77 | 73 | 2012-02-29 Charles Kerr <charles.kerr@canonical.com> | ||
78 | 74 | |||
79 | 75 | tweak: use g_clear_object() instead of if-not-null-g_object_unref() | ||
80 | 76 | |||
81 | 3 | 2012-02-23 Ted Gould <ted@gould.cx> | 77 | 2012-02-23 Ted Gould <ted@gould.cx> |
82 | 4 | 78 | ||
83 | 5 | 0.4.92 | 79 | 0.4.92 |
84 | 6 | 80 | ||
85 | === modified file 'build-aux/config.guess' | |||
86 | --- build-aux/config.guess 2012-01-24 16:07:33 +0000 | |||
87 | +++ build-aux/config.guess 2012-03-07 20:18:33 +0000 | |||
88 | @@ -2,9 +2,9 @@ | |||
89 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
90 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
91 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
93 | 5 | # 2011 Free Software Foundation, Inc. | 5 | # 2011, 2012 Free Software Foundation, Inc. |
94 | 6 | 6 | ||
96 | 7 | timestamp='2011-05-11' | 7 | timestamp='2012-02-10' |
97 | 8 | 8 | ||
98 | 9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
99 | 10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
100 | @@ -17,9 +17,7 @@ | |||
101 | 17 | # General Public License for more details. | 17 | # General Public License for more details. |
102 | 18 | # | 18 | # |
103 | 19 | # You should have received a copy of the GNU General Public License | 19 | # You should have received a copy of the GNU General Public License |
107 | 20 | # along with this program; if not, write to the Free Software | 20 | # along with this program; if not, see <http://www.gnu.org/licenses/>. |
105 | 21 | # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA | ||
106 | 22 | # 02110-1301, USA. | ||
108 | 23 | # | 21 | # |
109 | 24 | # As a special exception to the GNU General Public License, if you | 22 | # As a special exception to the GNU General Public License, if you |
110 | 25 | # distribute this file as part of a program that contains a | 23 | # distribute this file as part of a program that contains a |
111 | @@ -57,8 +55,8 @@ | |||
112 | 57 | 55 | ||
113 | 58 | Originally written by Per Bothner. | 56 | Originally written by Per Bothner. |
114 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 57 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
117 | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free | 58 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
118 | 61 | Software Foundation, Inc. | 59 | Free Software Foundation, Inc. |
119 | 62 | 60 | ||
120 | 63 | This is free software; see the source for copying conditions. There is NO | 61 | This is free software; see the source for copying conditions. There is NO |
121 | 64 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 62 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
122 | @@ -145,7 +143,7 @@ | |||
123 | 145 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 143 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
124 | 146 | *:NetBSD:*:*) | 144 | *:NetBSD:*:*) |
125 | 147 | # NetBSD (nbsd) targets should (where applicable) match one or | 145 | # NetBSD (nbsd) targets should (where applicable) match one or |
127 | 148 | # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, | 146 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
128 | 149 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently | 147 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
129 | 150 | # switched to ELF, *-*-netbsd* would select the old | 148 | # switched to ELF, *-*-netbsd* would select the old |
130 | 151 | # object file format. This provides both forward | 149 | # object file format. This provides both forward |
131 | @@ -792,13 +790,12 @@ | |||
132 | 792 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | 790 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
133 | 793 | exit ;; | 791 | exit ;; |
134 | 794 | *:FreeBSD:*:*) | 792 | *:FreeBSD:*:*) |
138 | 795 | case ${UNAME_MACHINE} in | 793 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
139 | 796 | pc98) | 794 | case ${UNAME_PROCESSOR} in |
137 | 797 | echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
140 | 798 | amd64) | 795 | amd64) |
141 | 799 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | 796 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
142 | 800 | *) | 797 | *) |
144 | 801 | echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | 798 | echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
145 | 802 | esac | 799 | esac |
146 | 803 | exit ;; | 800 | exit ;; |
147 | 804 | i*:CYGWIN*:*) | 801 | i*:CYGWIN*:*) |
148 | @@ -807,6 +804,9 @@ | |||
149 | 807 | *:MINGW*:*) | 804 | *:MINGW*:*) |
150 | 808 | echo ${UNAME_MACHINE}-pc-mingw32 | 805 | echo ${UNAME_MACHINE}-pc-mingw32 |
151 | 809 | exit ;; | 806 | exit ;; |
152 | 807 | i*:MSYS*:*) | ||
153 | 808 | echo ${UNAME_MACHINE}-pc-msys | ||
154 | 809 | exit ;; | ||
155 | 810 | i*:windows32*:*) | 810 | i*:windows32*:*) |
156 | 811 | # uname -m includes "-pc" on this system. | 811 | # uname -m includes "-pc" on this system. |
157 | 812 | echo ${UNAME_MACHINE}-mingw32 | 812 | echo ${UNAME_MACHINE}-mingw32 |
158 | @@ -861,6 +861,13 @@ | |||
159 | 861 | i*86:Minix:*:*) | 861 | i*86:Minix:*:*) |
160 | 862 | echo ${UNAME_MACHINE}-pc-minix | 862 | echo ${UNAME_MACHINE}-pc-minix |
161 | 863 | exit ;; | 863 | exit ;; |
162 | 864 | aarch64:Linux:*:*) | ||
163 | 865 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
164 | 866 | exit ;; | ||
165 | 867 | aarch64_be:Linux:*:*) | ||
166 | 868 | UNAME_MACHINE=aarch64_be | ||
167 | 869 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
168 | 870 | exit ;; | ||
169 | 864 | alpha:Linux:*:*) | 871 | alpha:Linux:*:*) |
170 | 865 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 872 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
171 | 866 | EV5) UNAME_MACHINE=alphaev5 ;; | 873 | EV5) UNAME_MACHINE=alphaev5 ;; |
172 | @@ -895,13 +902,16 @@ | |||
173 | 895 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 902 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
174 | 896 | exit ;; | 903 | exit ;; |
175 | 897 | cris:Linux:*:*) | 904 | cris:Linux:*:*) |
177 | 898 | echo cris-axis-linux-gnu | 905 | echo ${UNAME_MACHINE}-axis-linux-gnu |
178 | 899 | exit ;; | 906 | exit ;; |
179 | 900 | crisv32:Linux:*:*) | 907 | crisv32:Linux:*:*) |
181 | 901 | echo crisv32-axis-linux-gnu | 908 | echo ${UNAME_MACHINE}-axis-linux-gnu |
182 | 902 | exit ;; | 909 | exit ;; |
183 | 903 | frv:Linux:*:*) | 910 | frv:Linux:*:*) |
185 | 904 | echo frv-unknown-linux-gnu | 911 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
186 | 912 | exit ;; | ||
187 | 913 | hexagon:Linux:*:*) | ||
188 | 914 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
189 | 905 | exit ;; | 915 | exit ;; |
190 | 906 | i*86:Linux:*:*) | 916 | i*86:Linux:*:*) |
191 | 907 | LIBC=gnu | 917 | LIBC=gnu |
192 | @@ -943,7 +953,7 @@ | |||
193 | 943 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 953 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
194 | 944 | ;; | 954 | ;; |
195 | 945 | or32:Linux:*:*) | 955 | or32:Linux:*:*) |
197 | 946 | echo or32-unknown-linux-gnu | 956 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
198 | 947 | exit ;; | 957 | exit ;; |
199 | 948 | padre:Linux:*:*) | 958 | padre:Linux:*:*) |
200 | 949 | echo sparc-unknown-linux-gnu | 959 | echo sparc-unknown-linux-gnu |
201 | @@ -978,13 +988,13 @@ | |||
202 | 978 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 988 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
203 | 979 | exit ;; | 989 | exit ;; |
204 | 980 | tile*:Linux:*:*) | 990 | tile*:Linux:*:*) |
206 | 981 | echo ${UNAME_MACHINE}-tilera-linux-gnu | 991 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
207 | 982 | exit ;; | 992 | exit ;; |
208 | 983 | vax:Linux:*:*) | 993 | vax:Linux:*:*) |
209 | 984 | echo ${UNAME_MACHINE}-dec-linux-gnu | 994 | echo ${UNAME_MACHINE}-dec-linux-gnu |
210 | 985 | exit ;; | 995 | exit ;; |
211 | 986 | x86_64:Linux:*:*) | 996 | x86_64:Linux:*:*) |
213 | 987 | echo x86_64-unknown-linux-gnu | 997 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
214 | 988 | exit ;; | 998 | exit ;; |
215 | 989 | xtensa*:Linux:*:*) | 999 | xtensa*:Linux:*:*) |
216 | 990 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 1000 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
217 | @@ -1315,6 +1325,9 @@ | |||
218 | 1315 | i*86:AROS:*:*) | 1325 | i*86:AROS:*:*) |
219 | 1316 | echo ${UNAME_MACHINE}-pc-aros | 1326 | echo ${UNAME_MACHINE}-pc-aros |
220 | 1317 | exit ;; | 1327 | exit ;; |
221 | 1328 | x86_64:VMkernel:*:*) | ||
222 | 1329 | echo ${UNAME_MACHINE}-unknown-esx | ||
223 | 1330 | exit ;; | ||
224 | 1318 | esac | 1331 | esac |
225 | 1319 | 1332 | ||
226 | 1320 | #echo '(No uname command or uname output not recognized.)' 1>&2 | 1333 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
227 | 1321 | 1334 | ||
228 | === modified file 'build-aux/config.sub' | |||
229 | --- build-aux/config.sub 2012-01-24 16:07:33 +0000 | |||
230 | +++ build-aux/config.sub 2012-03-07 20:18:33 +0000 | |||
231 | @@ -2,9 +2,9 @@ | |||
232 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
233 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
234 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
236 | 5 | # 2011 Free Software Foundation, Inc. | 5 | # 2011, 2012 Free Software Foundation, Inc. |
237 | 6 | 6 | ||
239 | 7 | timestamp='2011-03-23' | 7 | timestamp='2012-02-10' |
240 | 8 | 8 | ||
241 | 9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
242 | 10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
243 | @@ -21,9 +21,7 @@ | |||
244 | 21 | # GNU General Public License for more details. | 21 | # GNU General Public License for more details. |
245 | 22 | # | 22 | # |
246 | 23 | # You should have received a copy of the GNU General Public License | 23 | # You should have received a copy of the GNU General Public License |
250 | 24 | # along with this program; if not, write to the Free Software | 24 | # along with this program; if not, see <http://www.gnu.org/licenses/>. |
248 | 25 | # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA | ||
249 | 26 | # 02110-1301, USA. | ||
251 | 27 | # | 25 | # |
252 | 28 | # As a special exception to the GNU General Public License, if you | 26 | # As a special exception to the GNU General Public License, if you |
253 | 29 | # distribute this file as part of a program that contains a | 27 | # distribute this file as part of a program that contains a |
254 | @@ -76,8 +74,8 @@ | |||
255 | 76 | GNU config.sub ($timestamp) | 74 | GNU config.sub ($timestamp) |
256 | 77 | 75 | ||
257 | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 76 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
260 | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free | 77 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
261 | 80 | Software Foundation, Inc. | 78 | Free Software Foundation, Inc. |
262 | 81 | 79 | ||
263 | 82 | This is free software; see the source for copying conditions. There is NO | 80 | This is free software; see the source for copying conditions. There is NO |
264 | 83 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 81 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
265 | @@ -132,6 +130,10 @@ | |||
266 | 132 | os=-$maybe_os | 130 | os=-$maybe_os |
267 | 133 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 131 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
268 | 134 | ;; | 132 | ;; |
269 | 133 | android-linux) | ||
270 | 134 | os=-linux-android | ||
271 | 135 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown | ||
272 | 136 | ;; | ||
273 | 135 | *) | 137 | *) |
274 | 136 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` | 138 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
275 | 137 | if [ $basic_machine != $1 ] | 139 | if [ $basic_machine != $1 ] |
276 | @@ -247,17 +249,22 @@ | |||
277 | 247 | # Some are omitted here because they have special meanings below. | 249 | # Some are omitted here because they have special meanings below. |
278 | 248 | 1750a | 580 \ | 250 | 1750a | 580 \ |
279 | 249 | | a29k \ | 251 | | a29k \ |
280 | 252 | | aarch64 | aarch64_be \ | ||
281 | 250 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | 253 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
282 | 251 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | 254 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
283 | 252 | | am33_2.0 \ | 255 | | am33_2.0 \ |
284 | 253 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | 256 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
285 | 257 | | be32 | be64 \ | ||
286 | 254 | | bfin \ | 258 | | bfin \ |
287 | 255 | | c4x | clipper \ | 259 | | c4x | clipper \ |
288 | 256 | | d10v | d30v | dlx | dsp16xx \ | 260 | | d10v | d30v | dlx | dsp16xx \ |
289 | 261 | | epiphany \ | ||
290 | 257 | | fido | fr30 | frv \ | 262 | | fido | fr30 | frv \ |
291 | 258 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | 263 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
292 | 264 | | hexagon \ | ||
293 | 259 | | i370 | i860 | i960 | ia64 \ | 265 | | i370 | i860 | i960 | ia64 \ |
294 | 260 | | ip2k | iq2000 \ | 266 | | ip2k | iq2000 \ |
295 | 267 | | le32 | le64 \ | ||
296 | 261 | | lm32 \ | 268 | | lm32 \ |
297 | 262 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | 269 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
298 | 263 | | maxq | mb | microblaze | mcore | mep | metag \ | 270 | | maxq | mb | microblaze | mcore | mep | metag \ |
299 | @@ -291,7 +298,7 @@ | |||
300 | 291 | | pdp10 | pdp11 | pj | pjl \ | 298 | | pdp10 | pdp11 | pj | pjl \ |
301 | 292 | | powerpc | powerpc64 | powerpc64le | powerpcle \ | 299 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
302 | 293 | | pyramid \ | 300 | | pyramid \ |
304 | 294 | | rx \ | 301 | | rl78 | rx \ |
305 | 295 | | score \ | 302 | | score \ |
306 | 296 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 303 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
307 | 297 | | sh64 | sh64le \ | 304 | | sh64 | sh64le \ |
308 | @@ -300,7 +307,7 @@ | |||
309 | 300 | | spu \ | 307 | | spu \ |
310 | 301 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | 308 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
311 | 302 | | ubicom32 \ | 309 | | ubicom32 \ |
313 | 303 | | v850 | v850e \ | 310 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
314 | 304 | | we32k \ | 311 | | we32k \ |
315 | 305 | | x86 | xc16x | xstormy16 | xtensa \ | 312 | | x86 | xc16x | xstormy16 | xtensa \ |
316 | 306 | | z8k | z80) | 313 | | z8k | z80) |
317 | @@ -315,8 +322,7 @@ | |||
318 | 315 | c6x) | 322 | c6x) |
319 | 316 | basic_machine=tic6x-unknown | 323 | basic_machine=tic6x-unknown |
320 | 317 | ;; | 324 | ;; |
323 | 318 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) | 325 | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
322 | 319 | # Motorola 68HC11/12. | ||
324 | 320 | basic_machine=$basic_machine-unknown | 326 | basic_machine=$basic_machine-unknown |
325 | 321 | os=-none | 327 | os=-none |
326 | 322 | ;; | 328 | ;; |
327 | @@ -329,7 +335,10 @@ | |||
328 | 329 | strongarm | thumb | xscale) | 335 | strongarm | thumb | xscale) |
329 | 330 | basic_machine=arm-unknown | 336 | basic_machine=arm-unknown |
330 | 331 | ;; | 337 | ;; |
332 | 332 | 338 | xgate) | |
333 | 339 | basic_machine=$basic_machine-unknown | ||
334 | 340 | os=-none | ||
335 | 341 | ;; | ||
336 | 333 | xscaleeb) | 342 | xscaleeb) |
337 | 334 | basic_machine=armeb-unknown | 343 | basic_machine=armeb-unknown |
338 | 335 | ;; | 344 | ;; |
339 | @@ -352,11 +361,13 @@ | |||
340 | 352 | # Recognize the basic CPU types with company name. | 361 | # Recognize the basic CPU types with company name. |
341 | 353 | 580-* \ | 362 | 580-* \ |
342 | 354 | | a29k-* \ | 363 | | a29k-* \ |
343 | 364 | | aarch64-* | aarch64_be-* \ | ||
344 | 355 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | 365 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
345 | 356 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | 366 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
346 | 357 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | 367 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
347 | 358 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | 368 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
348 | 359 | | avr-* | avr32-* \ | 369 | | avr-* | avr32-* \ |
349 | 370 | | be32-* | be64-* \ | ||
350 | 360 | | bfin-* | bs2000-* \ | 371 | | bfin-* | bs2000-* \ |
351 | 361 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ | 372 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
352 | 362 | | clipper-* | craynv-* | cydra-* \ | 373 | | clipper-* | craynv-* | cydra-* \ |
353 | @@ -365,8 +376,10 @@ | |||
354 | 365 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | 376 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
355 | 366 | | h8300-* | h8500-* \ | 377 | | h8300-* | h8500-* \ |
356 | 367 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | 378 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
357 | 379 | | hexagon-* \ | ||
358 | 368 | | i*86-* | i860-* | i960-* | ia64-* \ | 380 | | i*86-* | i860-* | i960-* | ia64-* \ |
359 | 369 | | ip2k-* | iq2000-* \ | 381 | | ip2k-* | iq2000-* \ |
360 | 382 | | le32-* | le64-* \ | ||
361 | 370 | | lm32-* \ | 383 | | lm32-* \ |
362 | 371 | | m32c-* | m32r-* | m32rle-* \ | 384 | | m32c-* | m32r-* | m32rle-* \ |
363 | 372 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | 385 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
364 | @@ -400,7 +413,7 @@ | |||
365 | 400 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 413 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
366 | 401 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | 414 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
367 | 402 | | pyramid-* \ | 415 | | pyramid-* \ |
369 | 403 | | romp-* | rs6000-* | rx-* \ | 416 | | rl78-* | romp-* | rs6000-* | rx-* \ |
370 | 404 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 417 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
371 | 405 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 418 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
372 | 406 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 419 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
373 | @@ -408,10 +421,11 @@ | |||
374 | 408 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | 421 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
375 | 409 | | tahoe-* \ | 422 | | tahoe-* \ |
376 | 410 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | 423 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
378 | 411 | | tile-* | tilegx-* \ | 424 | | tile*-* \ |
379 | 412 | | tron-* \ | 425 | | tron-* \ |
380 | 413 | | ubicom32-* \ | 426 | | ubicom32-* \ |
382 | 414 | | v850-* | v850e-* | vax-* \ | 427 | | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
383 | 428 | | vax-* \ | ||
384 | 415 | | we32k-* \ | 429 | | we32k-* \ |
385 | 416 | | x86-* | x86_64-* | xc16x-* | xps100-* \ | 430 | | x86-* | x86_64-* | xc16x-* | xps100-* \ |
386 | 417 | | xstormy16-* | xtensa*-* \ | 431 | | xstormy16-* | xtensa*-* \ |
387 | @@ -711,7 +725,6 @@ | |||
388 | 711 | i370-ibm* | ibm*) | 725 | i370-ibm* | ibm*) |
389 | 712 | basic_machine=i370-ibm | 726 | basic_machine=i370-ibm |
390 | 713 | ;; | 727 | ;; |
391 | 714 | # I'm not sure what "Sysv32" means. Should this be sysv3.2? | ||
392 | 715 | i*86v32) | 728 | i*86v32) |
393 | 716 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 729 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
394 | 717 | os=-sysv32 | 730 | os=-sysv32 |
395 | @@ -808,10 +821,18 @@ | |||
396 | 808 | ms1-*) | 821 | ms1-*) |
397 | 809 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` | 822 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
398 | 810 | ;; | 823 | ;; |
399 | 824 | msys) | ||
400 | 825 | basic_machine=i386-pc | ||
401 | 826 | os=-msys | ||
402 | 827 | ;; | ||
403 | 811 | mvs) | 828 | mvs) |
404 | 812 | basic_machine=i370-ibm | 829 | basic_machine=i370-ibm |
405 | 813 | os=-mvs | 830 | os=-mvs |
406 | 814 | ;; | 831 | ;; |
407 | 832 | nacl) | ||
408 | 833 | basic_machine=le32-unknown | ||
409 | 834 | os=-nacl | ||
410 | 835 | ;; | ||
411 | 815 | ncr3000) | 836 | ncr3000) |
412 | 816 | basic_machine=i486-ncr | 837 | basic_machine=i486-ncr |
413 | 817 | os=-sysv4 | 838 | os=-sysv4 |
414 | @@ -1120,13 +1141,8 @@ | |||
415 | 1120 | basic_machine=t90-cray | 1141 | basic_machine=t90-cray |
416 | 1121 | os=-unicos | 1142 | os=-unicos |
417 | 1122 | ;; | 1143 | ;; |
418 | 1123 | # This must be matched before tile*. | ||
419 | 1124 | tilegx*) | ||
420 | 1125 | basic_machine=tilegx-unknown | ||
421 | 1126 | os=-linux-gnu | ||
422 | 1127 | ;; | ||
423 | 1128 | tile*) | 1144 | tile*) |
425 | 1129 | basic_machine=tile-unknown | 1145 | basic_machine=$basic_machine-unknown |
426 | 1130 | os=-linux-gnu | 1146 | os=-linux-gnu |
427 | 1131 | ;; | 1147 | ;; |
428 | 1132 | tx39) | 1148 | tx39) |
429 | @@ -1336,7 +1352,7 @@ | |||
430 | 1336 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | 1352 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
431 | 1337 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1353 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
432 | 1338 | | -chorusos* | -chorusrdb* | -cegcc* \ | 1354 | | -chorusos* | -chorusrdb* | -cegcc* \ |
434 | 1339 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1355 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
435 | 1340 | | -mingw32* | -linux-gnu* | -linux-android* \ | 1356 | | -mingw32* | -linux-gnu* | -linux-android* \ |
436 | 1341 | | -linux-newlib* | -linux-uclibc* \ | 1357 | | -linux-newlib* | -linux-uclibc* \ |
437 | 1342 | | -uxpv* | -beos* | -mpeix* | -udk* \ | 1358 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
438 | @@ -1548,9 +1564,6 @@ | |||
439 | 1548 | ;; | 1564 | ;; |
440 | 1549 | m68000-sun) | 1565 | m68000-sun) |
441 | 1550 | os=-sunos3 | 1566 | os=-sunos3 |
442 | 1551 | # This also exists in the configure program, but was not the | ||
443 | 1552 | # default. | ||
444 | 1553 | # os=-sunos4 | ||
445 | 1554 | ;; | 1567 | ;; |
446 | 1555 | m68*-cisco) | 1568 | m68*-cisco) |
447 | 1556 | os=-aout | 1569 | os=-aout |
448 | 1557 | 1570 | ||
449 | === modified file 'configure' | |||
450 | --- configure 2012-02-23 11:28:01 +0000 | |||
451 | +++ configure 2012-03-07 20:18:33 +0000 | |||
452 | @@ -1,6 +1,6 @@ | |||
453 | 1 | #! /bin/sh | 1 | #! /bin/sh |
454 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
456 | 3 | # Generated by GNU Autoconf 2.68 for libindicator 0.4.92. | 3 | # Generated by GNU Autoconf 2.68 for libindicator 0.4.93. |
457 | 4 | # | 4 | # |
458 | 5 | # Report bugs to <http://bugs.launchpad.net/libindicator>. | 5 | # Report bugs to <http://bugs.launchpad.net/libindicator>. |
459 | 6 | # | 6 | # |
460 | @@ -570,8 +570,8 @@ | |||
461 | 570 | # Identity of this package. | 570 | # Identity of this package. |
462 | 571 | PACKAGE_NAME='libindicator' | 571 | PACKAGE_NAME='libindicator' |
463 | 572 | PACKAGE_TARNAME='libindicator' | 572 | PACKAGE_TARNAME='libindicator' |
466 | 573 | PACKAGE_VERSION='0.4.92' | 573 | PACKAGE_VERSION='0.4.93' |
467 | 574 | PACKAGE_STRING='libindicator 0.4.92' | 574 | PACKAGE_STRING='libindicator 0.4.93' |
468 | 575 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator' | 575 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator' |
469 | 576 | PACKAGE_URL='http://launchpad.net/libindicator' | 576 | PACKAGE_URL='http://launchpad.net/libindicator' |
470 | 577 | 577 | ||
471 | @@ -1330,7 +1330,7 @@ | |||
472 | 1330 | # Omit some internal or obsolete options to make the list less imposing. | 1330 | # Omit some internal or obsolete options to make the list less imposing. |
473 | 1331 | # This message is too long to be a string in the A/UX 3.1 sh. | 1331 | # This message is too long to be a string in the A/UX 3.1 sh. |
474 | 1332 | cat <<_ACEOF | 1332 | cat <<_ACEOF |
476 | 1333 | \`configure' configures libindicator 0.4.92 to adapt to many kinds of systems. | 1333 | \`configure' configures libindicator 0.4.93 to adapt to many kinds of systems. |
477 | 1334 | 1334 | ||
478 | 1335 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1335 | Usage: $0 [OPTION]... [VAR=VALUE]... |
479 | 1336 | 1336 | ||
480 | @@ -1400,7 +1400,7 @@ | |||
481 | 1400 | 1400 | ||
482 | 1401 | if test -n "$ac_init_help"; then | 1401 | if test -n "$ac_init_help"; then |
483 | 1402 | case $ac_init_help in | 1402 | case $ac_init_help in |
485 | 1403 | short | recursive ) echo "Configuration of libindicator 0.4.92:";; | 1403 | short | recursive ) echo "Configuration of libindicator 0.4.93:";; |
486 | 1404 | esac | 1404 | esac |
487 | 1405 | cat <<\_ACEOF | 1405 | cat <<\_ACEOF |
488 | 1406 | 1406 | ||
489 | @@ -1520,7 +1520,7 @@ | |||
490 | 1520 | test -n "$ac_init_help" && exit $ac_status | 1520 | test -n "$ac_init_help" && exit $ac_status |
491 | 1521 | if $ac_init_version; then | 1521 | if $ac_init_version; then |
492 | 1522 | cat <<\_ACEOF | 1522 | cat <<\_ACEOF |
494 | 1523 | libindicator configure 0.4.92 | 1523 | libindicator configure 0.4.93 |
495 | 1524 | generated by GNU Autoconf 2.68 | 1524 | generated by GNU Autoconf 2.68 |
496 | 1525 | 1525 | ||
497 | 1526 | Copyright (C) 2010 Free Software Foundation, Inc. | 1526 | Copyright (C) 2010 Free Software Foundation, Inc. |
498 | @@ -1798,7 +1798,7 @@ | |||
499 | 1798 | This file contains any messages produced by compilers while | 1798 | This file contains any messages produced by compilers while |
500 | 1799 | running configure, to aid debugging if configure makes a mistake. | 1799 | running configure, to aid debugging if configure makes a mistake. |
501 | 1800 | 1800 | ||
503 | 1801 | It was created by libindicator $as_me 0.4.92, which was | 1801 | It was created by libindicator $as_me 0.4.93, which was |
504 | 1802 | generated by GNU Autoconf 2.68. Invocation command line was | 1802 | generated by GNU Autoconf 2.68. Invocation command line was |
505 | 1803 | 1803 | ||
506 | 1804 | $ $0 $@ | 1804 | $ $0 $@ |
507 | @@ -2620,7 +2620,7 @@ | |||
508 | 2620 | 2620 | ||
509 | 2621 | # Define the identity of the package. | 2621 | # Define the identity of the package. |
510 | 2622 | PACKAGE='libindicator' | 2622 | PACKAGE='libindicator' |
512 | 2623 | VERSION='0.4.92' | 2623 | VERSION='0.4.93' |
513 | 2624 | 2624 | ||
514 | 2625 | 2625 | ||
515 | 2626 | cat >>confdefs.h <<_ACEOF | 2626 | cat >>confdefs.h <<_ACEOF |
516 | @@ -13040,7 +13040,7 @@ | |||
517 | 13040 | # report actual input values of CONFIG_FILES etc. instead of their | 13040 | # report actual input values of CONFIG_FILES etc. instead of their |
518 | 13041 | # values after options handling. | 13041 | # values after options handling. |
519 | 13042 | ac_log=" | 13042 | ac_log=" |
521 | 13043 | This file was extended by libindicator $as_me 0.4.92, which was | 13043 | This file was extended by libindicator $as_me 0.4.93, which was |
522 | 13044 | generated by GNU Autoconf 2.68. Invocation command line was | 13044 | generated by GNU Autoconf 2.68. Invocation command line was |
523 | 13045 | 13045 | ||
524 | 13046 | CONFIG_FILES = $CONFIG_FILES | 13046 | CONFIG_FILES = $CONFIG_FILES |
525 | @@ -13107,7 +13107,7 @@ | |||
526 | 13107 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 13107 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
527 | 13108 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 13108 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
528 | 13109 | ac_cs_version="\\ | 13109 | ac_cs_version="\\ |
530 | 13110 | libindicator config.status 0.4.92 | 13110 | libindicator config.status 0.4.93 |
531 | 13111 | configured by $0, generated by GNU Autoconf 2.68, | 13111 | configured by $0, generated by GNU Autoconf 2.68, |
532 | 13112 | with options \\"\$ac_cs_config\\" | 13112 | with options \\"\$ac_cs_config\\" |
533 | 13113 | 13113 | ||
534 | 13114 | 13114 | ||
535 | === modified file 'configure.ac' | |||
536 | --- configure.ac 2012-02-23 11:28:01 +0000 | |||
537 | +++ configure.ac 2012-03-07 20:18:33 +0000 | |||
538 | @@ -1,5 +1,5 @@ | |||
539 | 1 | AC_INIT([libindicator], | 1 | AC_INIT([libindicator], |
541 | 2 | [0.4.92], | 2 | [0.4.93], |
542 | 3 | [http://bugs.launchpad.net/libindicator], | 3 | [http://bugs.launchpad.net/libindicator], |
543 | 4 | [libindicator], | 4 | [libindicator], |
544 | 5 | [http://launchpad.net/libindicator]) | 5 | [http://launchpad.net/libindicator]) |
545 | 6 | 6 | ||
546 | === modified file 'debian/changelog' | |||
547 | --- debian/changelog 2012-03-02 12:18:44 +0000 | |||
548 | +++ debian/changelog 2012-03-07 20:18:33 +0000 | |||
549 | @@ -1,3 +1,12 @@ | |||
550 | 1 | libindicator (0.4.93-0ubuntu1~ppa1) precise; urgency=low | ||
551 | 2 | |||
552 | 3 | * New upstream release. | ||
553 | 4 | * Fix branching past initialization of variables (LP: #939061) | ||
554 | 5 | * Support new FD.o Desktop Actions (LP: #942042) | ||
555 | 6 | * Fix valgrind error on unload (LP: #719457) | ||
556 | 7 | |||
557 | 8 | -- Ted Gould <ted@ubuntu.com> Wed, 07 Mar 2012 14:14:07 -0600 | ||
558 | 9 | |||
559 | 1 | libindicator (0.4.92-0ubuntu2) precise; urgency=low | 10 | libindicator (0.4.92-0ubuntu2) precise; urgency=low |
560 | 2 | 11 | ||
561 | 3 | * Backport support for the fdo desktop action spec, that's required | 12 | * Backport support for the fdo desktop action spec, that's required |
562 | 4 | 13 | ||
563 | === modified file 'libindicator/indicator-object.c' | |||
564 | --- libindicator/indicator-object.c 2012-02-23 11:28:01 +0000 | |||
565 | +++ libindicator/indicator-object.c 2012-03-07 20:18:33 +0000 | |||
566 | @@ -464,21 +464,16 @@ | |||
567 | 464 | goto unrefandout; | 464 | goto unrefandout; |
568 | 465 | } | 465 | } |
569 | 466 | 466 | ||
570 | 467 | IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object); | ||
571 | 468 | /* Now we can track the module */ | 467 | /* Now we can track the module */ |
573 | 469 | priv->module = module; | 468 | INDICATOR_OBJECT_GET_PRIVATE(object)->module = module; |
574 | 470 | 469 | ||
575 | 471 | return INDICATOR_OBJECT(object); | 470 | return INDICATOR_OBJECT(object); |
576 | 472 | 471 | ||
577 | 473 | /* Error, let's drop the object and return NULL. Sad when | 472 | /* Error, let's drop the object and return NULL. Sad when |
578 | 474 | this happens. */ | 473 | this happens. */ |
579 | 475 | unrefandout: | 474 | unrefandout: |
586 | 476 | if (object != NULL) { | 475 | g_clear_object (&object); |
587 | 477 | g_object_unref(object); | 476 | g_clear_object (&module); |
582 | 478 | } | ||
583 | 479 | if (module != NULL) { | ||
584 | 480 | g_object_unref(module); | ||
585 | 481 | } | ||
588 | 482 | g_warning("Error building IndicatorObject from file: %s", file); | 477 | g_warning("Error building IndicatorObject from file: %s", file); |
589 | 483 | return NULL; | 478 | return NULL; |
590 | 484 | } | 479 | } |
591 | 485 | 480 | ||
592 | === modified file 'libindicator/indicator-service.c' | |||
593 | --- libindicator/indicator-service.c 2011-07-14 18:34:38 +0000 | |||
594 | +++ libindicator/indicator-service.c 2012-03-07 20:18:33 +0000 | |||
595 | @@ -588,7 +588,9 @@ | |||
596 | 588 | /* Remove us from the watcher list here */ | 588 | /* Remove us from the watcher list here */ |
597 | 589 | gpointer watcher_item = g_hash_table_lookup(priv->watchers, name); | 589 | gpointer watcher_item = g_hash_table_lookup(priv->watchers, name); |
598 | 590 | if (watcher_item != NULL) { | 590 | if (watcher_item != NULL) { |
600 | 591 | g_hash_table_remove(priv->watchers, name); | 591 | gchar * safe_name = g_strdup(name); |
601 | 592 | g_hash_table_remove(priv->watchers, safe_name); | ||
602 | 593 | g_free(safe_name); | ||
603 | 592 | } else { | 594 | } else { |
604 | 593 | /* Odd that we couldn't find the person, but, eh */ | 595 | /* Odd that we couldn't find the person, but, eh */ |
605 | 594 | g_warning("Unable to find watcher who is unwatching: %s", name); | 596 | g_warning("Unable to find watcher who is unwatching: %s", name); |