libappindicator

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

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 265
Proposed branch: lp:~indicator-applet-developers/libappindicator/ubuntu
Merge into: lp:~ubuntu-desktop/libappindicator/ubuntu
Diff against target: 202 lines (+36/-25)
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/app-indicator.c (+3/-11)
To merge this branch: bzr merge lp:~indicator-applet-developers/libappindicator/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+54607@code.launchpad.net
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 2011-03-16 18:37:03 +0000
3+++ ChangeLog 2011-03-23 20:57:29 +0000
4@@ -1,5 +1,17 @@
5 # Generated by Makefile. Do not edit.
6
7+2011-03-23 Ted Gould <ted@gould.cx>
8+
9+ 0.3.0
10+
11+2011-03-23 Ted Gould <ted@gould.cx>
12+
13+ Use icon-name instead of GIcon in the fallback GtkStatusIcon
14+
15+2011-03-23 Ted Gould <ted@gould.cx>
16+
17+ Set gtk_status_icon using icon_name instead of gicon
18+
19 2011-03-16 Ted Gould <ted@gould.cx>
20
21 0.2.99
22
23=== modified file 'configure'
24--- configure 2011-03-16 18:37:03 +0000
25+++ configure 2011-03-23 20:57:29 +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 libappindicator 0.2.99.
30+# Generated by GNU Autoconf 2.67 for libappindicator 0.3.0.
31 #
32 # Report bugs to <ted@canonical.com>.
33 #
34@@ -763,8 +763,8 @@
35 # Identity of this package.
36 PACKAGE_NAME='libappindicator'
37 PACKAGE_TARNAME='libappindicator'
38-PACKAGE_VERSION='0.2.99'
39-PACKAGE_STRING='libappindicator 0.2.99'
40+PACKAGE_VERSION='0.3.0'
41+PACKAGE_STRING='libappindicator 0.3.0'
42 PACKAGE_BUGREPORT='ted@canonical.com'
43 PACKAGE_URL=''
44
45@@ -1581,7 +1581,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 libappindicator 0.2.99 to adapt to many kinds of systems.
50+\`configure' configures libappindicator 0.3.0 to adapt to many kinds of systems.
51
52 Usage: $0 [OPTION]... [VAR=VALUE]...
53
54@@ -1651,7 +1651,7 @@
55
56 if test -n "$ac_init_help"; then
57 case $ac_init_help in
58- short | recursive ) echo "Configuration of libappindicator 0.2.99:";;
59+ short | recursive ) echo "Configuration of libappindicator 0.3.0:";;
60 esac
61 cat <<\_ACEOF
62
63@@ -1793,7 +1793,7 @@
64 test -n "$ac_init_help" && exit $ac_status
65 if $ac_init_version; then
66 cat <<\_ACEOF
67-libappindicator configure 0.2.99
68+libappindicator configure 0.3.0
69 generated by GNU Autoconf 2.67
70
71 Copyright (C) 2010 Free Software Foundation, Inc.
72@@ -2073,7 +2073,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 libappindicator $as_me 0.2.99, which was
77+It was created by libappindicator $as_me 0.3.0, which was
78 generated by GNU Autoconf 2.67. Invocation command line was
79
80 $ $0 $@
81@@ -2894,7 +2894,7 @@
82
83 # Define the identity of the package.
84 PACKAGE=libappindicator
85- VERSION=0.2.99
86+ VERSION=0.3.0
87
88
89 cat >>confdefs.h <<_ACEOF
90@@ -14120,7 +14120,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 libappindicator $as_me 0.2.99, which was
95+This file was extended by libappindicator $as_me 0.3.0, which was
96 generated by GNU Autoconf 2.67. Invocation command line was
97
98 CONFIG_FILES = $CONFIG_FILES
99@@ -14186,7 +14186,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-libappindicator config.status 0.2.99
104+libappindicator config.status 0.3.0
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 2011-03-16 18:37:03 +0000
111+++ configure.ac 2011-03-23 20:57:29 +0000
112@@ -1,11 +1,11 @@
113
114-AC_INIT(libappindicator, 0.2.99, ted@canonical.com)
115+AC_INIT(libappindicator, 0.3.0, 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(libappindicator, 0.2.99)
122+AM_INIT_AUTOMAKE(libappindicator, 0.3.0)
123
124 AM_MAINTAINER_MODE
125
126
127=== modified file 'debian/changelog'
128--- debian/changelog 2011-03-16 19:52:31 +0000
129+++ debian/changelog 2011-03-23 20:57:29 +0000
130@@ -1,3 +1,10 @@
131+libappindicator (0.3.0-0ubuntu1~ppa1) natty; urgency=low
132+
133+ * New upstream release.
134+ * Don't use GIcon with GtkStatusIcon (LP: #708118)
135+
136+ -- Ted Gould <ted@ubuntu.com> Wed, 23 Mar 2011 15:50:55 -0500
137+
138 libappindicator (0.2.99-0ubuntu1) natty; urgency=low
139
140 * New upstream release.
141
142=== modified file 'docs/reference/libappindicator-docs.sgml'
143--- docs/reference/libappindicator-docs.sgml 2011-03-16 18:37:03 +0000
144+++ docs/reference/libappindicator-docs.sgml 2011-03-23 20:57:29 +0000
145@@ -8,7 +8,7 @@
146 <bookinfo>
147 <title>libappindicator Reference Manual</title>
148 <releaseinfo>
149- for libappindicator 0.2.99
150+ for libappindicator 0.3.0
151 </releaseinfo>
152 </bookinfo>
153
154
155=== modified file 'docs/reference/version.xml'
156--- docs/reference/version.xml 2011-03-16 18:37:03 +0000
157+++ docs/reference/version.xml 2011-03-23 20:57:29 +0000
158@@ -1,1 +1,1 @@
159-0.2.99
160+0.3.0
161
162=== modified file 'src/app-indicator.c'
163--- src/app-indicator.c 2011-03-16 18:37:03 +0000
164+++ src/app-indicator.c 2011-03-23 20:57:29 +0000
165@@ -1471,34 +1471,26 @@
166 status_icon_changes (AppIndicator * self, gpointer data)
167 {
168 GtkStatusIcon * icon = GTK_STATUS_ICON(data);
169- GIcon *themed_icon = NULL;
170 gchar *longname = NULL;
171
172 switch (app_indicator_get_status(self)) {
173 case APP_INDICATOR_STATUS_PASSIVE:
174 longname = append_panel_icon_suffix(app_indicator_get_icon(self));
175- themed_icon = g_themed_icon_new_with_default_fallbacks (longname);
176 gtk_status_icon_set_visible(icon, FALSE);
177- gtk_status_icon_set_from_gicon(icon, themed_icon);
178+ gtk_status_icon_set_from_icon_name(icon, longname);
179 break;
180 case APP_INDICATOR_STATUS_ACTIVE:
181 longname = append_panel_icon_suffix(app_indicator_get_icon(self));
182- themed_icon = g_themed_icon_new_with_default_fallbacks (longname);
183- gtk_status_icon_set_from_gicon(icon, themed_icon);
184+ gtk_status_icon_set_from_icon_name(icon, longname);
185 gtk_status_icon_set_visible(icon, TRUE);
186 break;
187 case APP_INDICATOR_STATUS_ATTENTION:
188 longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self));
189- themed_icon = g_themed_icon_new_with_default_fallbacks (longname);
190- gtk_status_icon_set_from_gicon(icon, themed_icon);
191+ gtk_status_icon_set_from_icon_name(icon, longname);
192 gtk_status_icon_set_visible(icon, TRUE);
193 break;
194 };
195
196- if (themed_icon) {
197- g_object_unref (themed_icon);
198- }
199-
200 if (longname) {
201 g_free(longname);
202 }

Subscribers

People subscribed via source and target branches