Ubuntu
libappindicator package

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

  1. Precise (12.04)
  2. upstream
  3. Merge into ubuntu
Proposed by Charles Kerr
Status: Merged
Merged at revision: 294
Proposed branch: lp:~indicator-applet-developers/ubuntu/precise/libappindicator/upstream
Merge into: lp:~ubuntu-desktop/libappindicator/ubuntu
Diff against target: 919 lines (+167/-133)
14 files modified
ChangeLog (+20/-0)
bindings/vala/examples/indicator-example.vala (+3/-3)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+9/-0)
debian/control (+1/-1)
docs/reference/html/ch01.html (+1/-1)
docs/reference/html/index.html (+1/-1)
docs/reference/html/libappindicator-app-indicator.html (+16/-16)
docs/reference/libappindicator-docs.sgml (+1/-1)
docs/reference/version.xml (+1/-1)
example/simple-client-vala.c (+83/-75)
example/simple-client-vala.vala (+18/-18)
src/app-indicator.c (+2/-5)
To merge this branch: bzr merge lp:~indicator-applet-developers/ubuntu/precise/libappindicator/upstream
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+98738@code.launchpad.net

Description of the change

0.4.92

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-03-09 18:11:25 +0000
3+++ ChangeLog 2012-03-21 21:39:25 +0000
4@@ -1,5 +1,25 @@
5 # Generated by Makefile. Do not edit.
6
7+2012-03-21 Charles Kerr <charles.kerr@canonical.com>
8+
9+ 0.4.92
10+
11+2012-03-21 Charles Kerr <charles.kerr@canonical.com>
12+
13+ merge lp:~charlesk/libappindicator/fix-vala-examples to resolve ambiguity in the vala examples between glib.Menu and Gtk.Menu
14+
15+2012-03-21 Charles Kerr <charles.kerr@canonical.com>
16+
17+ The vala examples were written before GMenu, so add explict namespace use here to avoid valac errors caused by namespace ambiguity between glib and gtk (ie, use 'new Gtk.Menu' instead of 'new Menu')
18+
19+2012-03-19 Charles Kerr <charles.kerr@canonical.com>
20+
21+ merge lp:~charlesk/libappindicator/lp-957471 to fix a PW.BRANCH_PAST_INITIALIZATION error reported by Coverity in bug #957471
22+
23+2012-03-16 Charles Kerr <charles.kerr@canonical.com>
24+
25+ remove oddly-scoped variable to fix a CID 10737 - PW.BRANCH_PAST_INITIALIZATION warning reported by Coverity in Bug #957471
26+
27 2012-03-09 Ted Gould <ted@gould.cx>
28
29 0.4.91
30
31=== modified file 'bindings/vala/examples/indicator-example.vala'
32--- bindings/vala/examples/indicator-example.vala 2011-09-23 15:46:27 +0000
33+++ bindings/vala/examples/indicator-example.vala 2012-03-21 21:39:25 +0000
34@@ -39,16 +39,16 @@
35 indicator.set_status(IndicatorStatus.ACTIVE);
36 indicator.set_attention_icon("indicator-messages-new");
37
38- var menu = new Menu();
39+ var menu = new Gtk.Menu();
40
41- var item = new MenuItem.with_label("Foo");
42+ var item = new Gtk.MenuItem.with_label("Foo");
43 item.activate.connect(() => {
44 indicator.set_status(IndicatorStatus.ATTENTION);
45 });
46 item.show();
47 menu.append(item);
48
49- var bar = item = new MenuItem.with_label("Bar");
50+ var bar = item = new Gtk.MenuItem.with_label("Bar");
51 item.show();
52 item.activate.connect(() => {
53 indicator.set_status(IndicatorStatus.ACTIVE);
54
55=== modified file 'configure'
56--- configure 2012-03-09 18:11:25 +0000
57+++ configure 2012-03-21 21:39:25 +0000
58@@ -1,6 +1,6 @@
59 #! /bin/sh
60 # Guess values for system-dependent variables and create Makefiles.
61-# Generated by GNU Autoconf 2.68 for libappindicator 0.4.91.
62+# Generated by GNU Autoconf 2.68 for libappindicator 0.4.92.
63 #
64 # Report bugs to <http://bugs.launchpad.net/libappindicator>.
65 #
66@@ -632,8 +632,8 @@
67 # Identity of this package.
68 PACKAGE_NAME='libappindicator'
69 PACKAGE_TARNAME='libappindicator'
70-PACKAGE_VERSION='0.4.91'
71-PACKAGE_STRING='libappindicator 0.4.91'
72+PACKAGE_VERSION='0.4.92'
73+PACKAGE_STRING='libappindicator 0.4.92'
74 PACKAGE_BUGREPORT='http://bugs.launchpad.net/libappindicator'
75 PACKAGE_URL='http://launchpad.net/libappindicator'
76
77@@ -1470,7 +1470,7 @@
78 # Omit some internal or obsolete options to make the list less imposing.
79 # This message is too long to be a string in the A/UX 3.1 sh.
80 cat <<_ACEOF
81-\`configure' configures libappindicator 0.4.91 to adapt to many kinds of systems.
82+\`configure' configures libappindicator 0.4.92 to adapt to many kinds of systems.
83
84 Usage: $0 [OPTION]... [VAR=VALUE]...
85
86@@ -1540,7 +1540,7 @@
87
88 if test -n "$ac_init_help"; then
89 case $ac_init_help in
90- short | recursive ) echo "Configuration of libappindicator 0.4.91:";;
91+ short | recursive ) echo "Configuration of libappindicator 0.4.92:";;
92 esac
93 cat <<\_ACEOF
94
95@@ -1695,7 +1695,7 @@
96 test -n "$ac_init_help" && exit $ac_status
97 if $ac_init_version; then
98 cat <<\_ACEOF
99-libappindicator configure 0.4.91
100+libappindicator configure 0.4.92
101 generated by GNU Autoconf 2.68
102
103 Copyright (C) 2010 Free Software Foundation, Inc.
104@@ -1975,7 +1975,7 @@
105 This file contains any messages produced by compilers while
106 running configure, to aid debugging if configure makes a mistake.
107
108-It was created by libappindicator $as_me 0.4.91, which was
109+It was created by libappindicator $as_me 0.4.92, which was
110 generated by GNU Autoconf 2.68. Invocation command line was
111
112 $ $0 $@
113@@ -2798,7 +2798,7 @@
114
115 # Define the identity of the package.
116 PACKAGE='libappindicator'
117- VERSION='0.4.91'
118+ VERSION='0.4.92'
119
120
121 cat >>confdefs.h <<_ACEOF
122@@ -14667,7 +14667,7 @@
123 # report actual input values of CONFIG_FILES etc. instead of their
124 # values after options handling.
125 ac_log="
126-This file was extended by libappindicator $as_me 0.4.91, which was
127+This file was extended by libappindicator $as_me 0.4.92, which was
128 generated by GNU Autoconf 2.68. Invocation command line was
129
130 CONFIG_FILES = $CONFIG_FILES
131@@ -14734,7 +14734,7 @@
132 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
133 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
134 ac_cs_version="\\
135-libappindicator config.status 0.4.91
136+libappindicator config.status 0.4.92
137 configured by $0, generated by GNU Autoconf 2.68,
138 with options \\"\$ac_cs_config\\"
139
140
141=== modified file 'configure.ac'
142--- configure.ac 2012-03-09 18:11:25 +0000
143+++ configure.ac 2012-03-21 21:39:25 +0000
144@@ -1,5 +1,5 @@
145 AC_INIT([libappindicator],
146- [0.4.91],
147+ [0.4.92],
148 [http://bugs.launchpad.net/libappindicator],
149 [libappindicator],
150 [http://launchpad.net/libappindicator])
151
152=== modified file 'debian/changelog'
153--- debian/changelog 2012-03-09 20:47:59 +0000
154+++ debian/changelog 2012-03-21 21:39:25 +0000
155@@ -1,3 +1,12 @@
156+libappindicator (0.4.92-0ubuntu1) precise; urgency=low
157+
158+ * New upstream release.
159+ * Fix a Coverity PW.BRANCH_PAST_INITIALIZATION error (LP: #957471)
160+ * Fix FTB bug from ambiguity between Glib.Menu and Gtk.Menu in the Vala code
161+ * debian/control: Updating to valac-0.16
162+
163+ -- Charles Kerr <charles.kerr@canonical.com> Wed, 21 Mar 2012 16:35:56 -0500
164+
165 libappindicator (0.4.91-0ubuntu3) precise; urgency=low
166
167 * debian/rules: build without make check until the builder environment
168
169=== modified file 'debian/control'
170--- debian/control 2012-03-09 20:12:49 +0000
171+++ debian/control 2012-03-21 21:39:25 +0000
172@@ -32,7 +32,7 @@
173 gir1.2-gtk-2.0,
174 gir1.2-gtk-3.0,
175 dh-autoreconf,
176- valac-0.14,
177+ valac-0.16,
178 dbus-test-runner
179 Standards-Version: 3.9.1
180 Homepage: https://launchpad.net/libappindicator
181
182=== modified file 'docs/reference/html/ch01.html'
183--- docs/reference/html/ch01.html 2012-03-09 18:08:33 +0000
184+++ docs/reference/html/ch01.html 2012-03-21 21:39:25 +0000
185@@ -21,7 +21,7 @@
186 </tr></table>
187 <div class="chapter">
188 <div class="titlepage"><div><div><h2 class="title">
189-<a name="idp3818912"></a>Base Classes for Applications</h2></div></div></div>
190+<a name="idp2571432"></a>Base Classes for Applications</h2></div></div></div>
191 <div class="toc"><dl><dt>
192 <span class="refentrytitle"><a href="libappindicator-app-indicator.html">AppIndicator</a></span><span class="refpurpose"> — An object to put application information
193 into the panel.</span>
194
195=== modified file 'docs/reference/html/index.html'
196--- docs/reference/html/index.html 2012-03-09 18:08:33 +0000
197+++ docs/reference/html/index.html 2012-03-21 21:39:25 +0000
198@@ -15,7 +15,7 @@
199 <div>
200 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libappindicator Reference Manual</p></th></tr></table></div>
201 <div><p class="releaseinfo">
202- for libappindicator 0.4.91
203+ for libappindicator 0.4.92
204 </p></div>
205 </div>
206 <hr>
207
208=== modified file 'docs/reference/html/libappindicator-app-indicator.html'
209--- docs/reference/html/libappindicator-app-indicator.html 2012-03-09 18:08:33 +0000
210+++ docs/reference/html/libappindicator-app-indicator.html 2012-03-21 21:39:25 +0000
211@@ -86,7 +86,7 @@
212 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>,
213 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_desc</code></em>);
214 <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-menu" title="app_indicator_set_menu ()">app_indicator_set_menu</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
215- <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>);
216+ <em class="parameter"><code><a href="http://developer.gnome.org/devel/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>);
217 <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon" title="app_indicator_set_icon ()">app_indicator_set_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
218 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);
219 <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon-full" title="app_indicator_set_icon_full ()">app_indicator_set_icon_full</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
220@@ -101,7 +101,7 @@
221 <em class="parameter"><code><span class="type">guint32</span> ordering_index</code></em>);
222 <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-secondary-activate-target" title="app_indicator_set_secondary_activate_target ()">app_indicator_set_secondary_activate_target</a>
223 (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
224- <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *menuitem</code></em>);
225+ <em class="parameter"><code><a href="http://developer.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *menuitem</code></em>);
226 <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-title" title="app_indicator_set_title ()">app_indicator_set_title</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
227 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *title</code></em>);
228 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-id" title="app_indicator_get_id ()">app_indicator_get_id</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
229@@ -113,11 +113,11 @@
230 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-attention-icon" title="app_indicator_get_attention_icon ()">app_indicator_get_attention_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
231 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-attention-icon-desc" title="app_indicator_get_attention_icon_desc ()">app_indicator_get_attention_icon_desc</a>
232 (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
233-<a href="http://library.gnome.org/devel/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-menu" title="app_indicator_get_menu ()">app_indicator_get_menu</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
234+<a href="http://developer.gnome.org/devel/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-menu" title="app_indicator_get_menu ()">app_indicator_get_menu</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
235 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-label" title="app_indicator_get_label ()">app_indicator_get_label</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
236 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-label-guide" title="app_indicator_get_label_guide ()">app_indicator_get_label_guide</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
237 <span class="returnvalue">guint32</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-ordering-index" title="app_indicator_get_ordering_index ()">app_indicator_get_ordering_index</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
238-<a href="http://library.gnome.org/devel/gtk/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-secondary-activate-target" title="app_indicator_get_secondary_activate_target ()">app_indicator_get_secondary_activate_target</a>
239+<a href="http://developer.gnome.org/devel/gtk/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-secondary-activate-target" title="app_indicator_get_secondary_activate_target ()">app_indicator_get_secondary_activate_target</a>
240 (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
241 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-title" title="app_indicator_get_title ()">app_indicator_get_title</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
242 <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop" title="app_indicator_build_menu_from_desktop ()">app_indicator_build_menu_from_desktop</a>
243@@ -140,7 +140,7 @@
244 "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'>attention-icon-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
245 "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--category" title='The "category" property'>category</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only
246 "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--connected" title='The "connected" property'>connected</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read
247- "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server" title='The "dbus-menu-server" property'>dbus-menu-server</a>" <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>* : Read / Write
248+ "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server" title='The "dbus-menu-server" property'>dbus-menu-server</a>" <span class="type">DbusmenuServer</span>* : Read / Write
249 "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-desc" title='The "icon-desc" property'>icon-desc</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
250 "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'>icon-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write
251 "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-theme-path" title='The "icon-theme-path" property'>icon-theme-path</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct
252@@ -542,7 +542,7 @@
253 </tr>
254 <tr>
255 <td><p><span class="term"><em class="structfield"><code><a name="AppIndicatorClass.fallback"></a>fallback</code></em> ()</span></p></td>
256-<td>Function that gets called to make a <a href="http://library.gnome.org/devel/gtk/GtkStatusIcon.html"><span class="type">GtkStatusIcon</span></a> when
257+<td>Function that gets called to make a <a href="http://developer.gnome.org/devel/gtk/GtkStatusIcon.html"><span class="type">GtkStatusIcon</span></a> when
258 there is no Application Indicator area available.</td>
259 </tr>
260 <tr>
261@@ -745,7 +745,7 @@
262 <div class="refsect2">
263 <a name="app-indicator-set-menu"></a><h3>app_indicator_set_menu ()</h3>
264 <pre class="programlisting"><span class="returnvalue">void</span> app_indicator_set_menu (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
265- <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>);</pre>
266+ <em class="parameter"><code><a href="http://developer.gnome.org/devel/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>);</pre>
267 <p>
268 Sets the menu that should be shown when the Application Indicator
269 is clicked on in the panel. An application indicator will not
270@@ -764,7 +764,7 @@
271 </tr>
272 <tr>
273 <td><p><span class="term"><em class="parameter"><code>menu</code></em> :</span></p></td>
274-<td>A <a href="http://library.gnome.org/devel/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> to set. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
275+<td>A <a href="http://developer.gnome.org/devel/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> to set. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
276 </td>
277 </tr>
278 </tbody>
279@@ -914,13 +914,13 @@
280 <a name="app-indicator-set-secondary-activate-target"></a><h3>app_indicator_set_secondary_activate_target ()</h3>
281 <pre class="programlisting"><span class="returnvalue">void</span> app_indicator_set_secondary_activate_target
282 (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
283- <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *menuitem</code></em>);</pre>
284+ <em class="parameter"><code><a href="http://developer.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *menuitem</code></em>);</pre>
285 <p>
286 Set the <em class="parameter"><code>menuitem</code></em> to be activated when a secondary activation event (i.e. a
287 middle-click) is emitted over the <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> icon/label.
288 </p>
289 <p>
290-The <em class="parameter"><code>menuitem</code></em> can be also a complex <a href="http://library.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a>, but to get activated when
291+The <em class="parameter"><code>menuitem</code></em> can be also a complex <a href="http://developer.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a>, but to get activated when
292 a secondary activation occurs in the <span class="type">Appindicator</span>, it must be a visible and
293 active child (or inner-child) of the <span class="type">"menu"</span>.
294 </p>
295@@ -937,7 +937,7 @@
296 </tr>
297 <tr>
298 <td><p><span class="term"><em class="parameter"><code>menuitem</code></em> :</span></p></td>
299-<td>A <a href="http://library.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> to be activated on secondary activation. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
300+<td>A <a href="http://developer.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> to be activated on secondary activation. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
301 </td>
302 </tr>
303 </tbody>
304@@ -1150,7 +1150,7 @@
305 <hr>
306 <div class="refsect2">
307 <a name="app-indicator-get-menu"></a><h3>app_indicator_get_menu ()</h3>
308-<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * app_indicator_get_menu (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
309+<pre class="programlisting"><a href="http://developer.gnome.org/devel/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * app_indicator_get_menu (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
310 <p>
311 Gets the menu being used for this application indicator.
312 Wrapper function for property <span class="type">"menu"</span>.
313@@ -1164,7 +1164,7 @@
314 </tr>
315 <tr>
316 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
317-<td>A <a href="http://library.gnome.org/devel/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> object or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if one hasn't been set. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
318+<td>A <a href="http://developer.gnome.org/devel/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> object or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if one hasn't been set. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
319 </td>
320 </tr>
321 </tbody>
322@@ -1236,7 +1236,7 @@
323 <hr>
324 <div class="refsect2">
325 <a name="app-indicator-get-secondary-activate-target"></a><h3>app_indicator_get_secondary_activate_target ()</h3>
326-<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a> * app_indicator_get_secondary_activate_target
327+<pre class="programlisting"><a href="http://developer.gnome.org/devel/gtk/GtkWidget.html"><span class="returnvalue">GtkWidget</span></a> * app_indicator_get_secondary_activate_target
328 (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
329 <p>
330 Gets the menuitem being called on secondary-activate event.
331@@ -1250,7 +1250,7 @@
332 </tr>
333 <tr>
334 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
335-<td>A <a href="http://library.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> object or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none has been set. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
336+<td>A <a href="http://developer.gnome.org/devel/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> object or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none has been set. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
337 </td>
338 </tr>
339 </tbody>
340@@ -1353,7 +1353,7 @@
341 <hr>
342 <div class="refsect2">
343 <a name="AppIndicator--dbus-menu-server"></a><h3>The <code class="literal">"dbus-menu-server"</code> property</h3>
344-<pre class="programlisting"> "dbus-menu-server" <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>* : Read / Write</pre>
345+<pre class="programlisting"> "dbus-menu-server" <span class="type">DbusmenuServer</span>* : Read / Write</pre>
346 <p>
347 A way to get the internal dbusmenu server if it is available.
348 This should only be used for testing.
349
350=== modified file 'docs/reference/libappindicator-docs.sgml'
351--- docs/reference/libappindicator-docs.sgml 2012-03-09 18:11:25 +0000
352+++ docs/reference/libappindicator-docs.sgml 2012-03-21 21:39:25 +0000
353@@ -8,7 +8,7 @@
354 <bookinfo>
355 <title>libappindicator Reference Manual</title>
356 <releaseinfo>
357- for libappindicator 0.4.91
358+ for libappindicator 0.4.92
359 </releaseinfo>
360 </bookinfo>
361
362
363=== modified file 'docs/reference/version.xml'
364--- docs/reference/version.xml 2012-03-09 18:11:25 +0000
365+++ docs/reference/version.xml 2012-03-21 21:39:25 +0000
366@@ -1,1 +1,1 @@
367-0.4.91
368+0.4.92
369
370=== modified file 'example/simple-client-vala.c'
371--- example/simple-client-vala.c 2012-03-09 18:08:33 +0000
372+++ example/simple-client-vala.c 2012-03-21 21:39:25 +0000
373@@ -1,4 +1,4 @@
374-/* simple-client-vala.c generated by valac 0.14.2, the Vala compiler
375+/* simple-client-vala.c generated by valac 0.15.2, the Vala compiler
376 * generated from simple-client-vala.vala, do not modify */
377
378 /*
379@@ -110,31 +110,27 @@
380 static void simple_client_toggle_sensitivity (SimpleClient* self, GtkWidget* widget);
381 static void simple_client_append_submenu (SimpleClient* self, GtkMenuItem* item);
382 static Block1Data* block1_data_ref (Block1Data* _data1_);
383-static void block1_data_unref (Block1Data* _data1_);
384-static void __lambda0_ (SimpleClient* self);
385-static void ___lambda0__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
386-static void __lambda1_ (Block1Data* _data1_);
387-static void ___lambda1__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
388+static void block1_data_unref (void * _userdata_);
389 static void __lambda2_ (SimpleClient* self);
390 static void ___lambda2__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
391-static void __lambda3_ (SimpleClient* self);
392+static void __lambda3_ (Block1Data* _data1_);
393 static void ___lambda3__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
394+static void __lambda4_ (SimpleClient* self);
395+static void ___lambda4__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
396+static void __lambda5_ (SimpleClient* self);
397+static void ___lambda5__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
398 static void simple_client_label_toggle (SimpleClient* self, GtkMenuItem* item);
399 static Block2Data* block2_data_ref (Block2Data* _data2_);
400-static void block2_data_unref (Block2Data* _data2_);
401-static void __lambda4_ (SimpleClient* self, gint delta, guint direction);
402-static void ___lambda4__app_indicator_scroll_event (AppIndicator* _sender, gint delta, guint direction, gpointer self);
403-static gboolean __lambda5_ (SimpleClient* self);
404-static gboolean ___lambda5__gsource_func (gpointer self);
405-static void __lambda6_ (SimpleClient* self);
406-static void ___lambda6__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
407+static void block2_data_unref (void * _userdata_);
408+static void __lambda6_ (SimpleClient* self, gint delta, guint direction);
409+static void ___lambda6__app_indicator_scroll_event (AppIndicator* _sender, gint delta, guint direction, gpointer self);
410+static gboolean __lambda7_ (SimpleClient* self);
411+static gboolean ___lambda7__gsource_func (gpointer self);
412+static void __lambda8_ (SimpleClient* self);
413+static void ___lambda8__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
414 static void _g_object_unref0_ (gpointer var);
415 static void _g_slist_free__g_object_unref0_ (GSList* self);
416-static void __lambda7_ (SimpleClient* self);
417-static void ___lambda7__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
418-static void __lambda8_ (Block2Data* _data2_);
419-static void ___lambda8__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
420-static void __lambda9_ (Block2Data* _data2_);
421+static void __lambda9_ (SimpleClient* self);
422 static void ___lambda9__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
423 static void __lambda10_ (Block2Data* _data2_);
424 static void ___lambda10__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
425@@ -142,6 +138,10 @@
426 static void ___lambda11__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
427 static void __lambda12_ (Block2Data* _data2_);
428 static void ___lambda12__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
429+static void __lambda13_ (Block2Data* _data2_);
430+static void ___lambda13__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
431+static void __lambda14_ (Block2Data* _data2_);
432+static void ___lambda14__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
433 static void simple_client_finalize (SimpleClient* obj);
434
435
436@@ -218,22 +218,26 @@
437 }
438
439
440-static void block1_data_unref (Block1Data* _data1_) {
441+static void block1_data_unref (void * _userdata_) {
442+ Block1Data* _data1_;
443+ _data1_ = (Block1Data*) _userdata_;
444 if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
445- _simple_client_unref0 (_data1_->self);
446+ SimpleClient * self;
447+ self = _data1_->self;
448 _g_object_unref0 (_data1_->prev_mi);
449+ _simple_client_unref0 (self);
450 g_slice_free (Block1Data, _data1_);
451 }
452 }
453
454
455-static void __lambda0_ (SimpleClient* self) {
456+static void __lambda2_ (SimpleClient* self) {
457 g_print ("Sub1\n");
458 }
459
460
461-static void ___lambda0__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
462- __lambda0_ (self);
463+static void ___lambda2__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
464+ __lambda2_ (self);
465 }
466
467
468@@ -242,29 +246,29 @@
469 }
470
471
472-static void __lambda1_ (Block1Data* _data1_) {
473+static void __lambda3_ (Block1Data* _data1_) {
474 SimpleClient * self;
475 self = _data1_->self;
476 simple_client_toggle_sensitivity (self, (GtkWidget*) _data1_->prev_mi);
477 }
478
479
480-static void ___lambda1__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
481- __lambda1_ (self);
482+static void ___lambda3__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
483+ __lambda3_ (self);
484 }
485
486
487-static void __lambda2_ (SimpleClient* self) {
488+static void __lambda4_ (SimpleClient* self) {
489 g_print ("Sub3\n");
490 }
491
492
493-static void ___lambda2__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
494- __lambda2_ (self);
495+static void ___lambda4__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
496+ __lambda4_ (self);
497 }
498
499
500-static void __lambda3_ (SimpleClient* self) {
501+static void __lambda5_ (SimpleClient* self) {
502 AppIndicator* _tmp0_;
503 AppIndicatorStatus _tmp1_ = 0;
504 _tmp0_ = self->priv->ci;
505@@ -281,8 +285,8 @@
506 }
507
508
509-static void ___lambda3__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
510- __lambda3_ (self);
511+static void ___lambda5__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
512+ __lambda5_ (self);
513 }
514
515
516@@ -328,7 +332,7 @@
517 _tmp4_ = mi;
518 gtk_menu_shell_append ((GtkMenuShell*) menu, (GtkWidget*) _tmp4_);
519 _tmp5_ = mi;
520- g_signal_connect (_tmp5_, "activate", (GCallback) ___lambda0__gtk_menu_item_activate, self);
521+ g_signal_connect (_tmp5_, "activate", (GCallback) ___lambda2__gtk_menu_item_activate, self);
522 _tmp6_ = mi;
523 _tmp7_ = _g_object_ref0 (_tmp6_);
524 _data1_->prev_mi = _tmp7_;
525@@ -339,7 +343,7 @@
526 _tmp10_ = mi;
527 gtk_menu_shell_append ((GtkMenuShell*) menu, (GtkWidget*) _tmp10_);
528 _tmp11_ = mi;
529- g_signal_connect_data (_tmp11_, "activate", (GCallback) ___lambda1__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
530+ g_signal_connect_data (_tmp11_, "activate", (GCallback) ___lambda3__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
531 _tmp12_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Sub 3");
532 _tmp13_ = g_object_ref_sink (_tmp12_);
533 _g_object_unref0 (mi);
534@@ -347,7 +351,7 @@
535 _tmp14_ = mi;
536 gtk_menu_shell_append ((GtkMenuShell*) menu, (GtkWidget*) _tmp14_);
537 _tmp15_ = mi;
538- g_signal_connect (_tmp15_, "activate", (GCallback) ___lambda2__gtk_menu_item_activate, self);
539+ g_signal_connect (_tmp15_, "activate", (GCallback) ___lambda4__gtk_menu_item_activate, self);
540 _tmp16_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Toggle Attention");
541 _tmp17_ = g_object_ref_sink (_tmp16_);
542 _g_object_unref0 (mi);
543@@ -355,7 +359,7 @@
544 _tmp18_ = mi;
545 gtk_menu_shell_append ((GtkMenuShell*) menu, (GtkWidget*) _tmp18_);
546 _tmp19_ = mi;
547- g_signal_connect (_tmp19_, "activate", (GCallback) ___lambda3__gtk_menu_item_activate, self);
548+ g_signal_connect (_tmp19_, "activate", (GCallback) ___lambda5__gtk_menu_item_activate, self);
549 _tmp20_ = self->priv->ci;
550 _tmp21_ = mi;
551 app_indicator_set_secondary_activate_target (_tmp20_, (GtkWidget*) _tmp21_);
552@@ -395,20 +399,24 @@
553 }
554
555
556-static void block2_data_unref (Block2Data* _data2_) {
557+static void block2_data_unref (void * _userdata_) {
558+ Block2Data* _data2_;
559+ _data2_ = (Block2Data*) _userdata_;
560 if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
561- _simple_client_unref0 (_data2_->self);
562+ SimpleClient * self;
563+ self = _data2_->self;
564 _g_object_unref0 (_data2_->icon);
565 _g_object_unref0 (_data2_->show);
566 _g_object_unref0 (_data2_->att);
567 _g_object_unref0 (_data2_->imgitem);
568 _g_object_unref0 (_data2_->submenu);
569+ _simple_client_unref0 (self);
570 g_slice_free (Block2Data, _data2_);
571 }
572 }
573
574
575-static void __lambda4_ (SimpleClient* self, gint delta, guint direction) {
576+static void __lambda6_ (SimpleClient* self, gint delta, guint direction) {
577 gint _tmp0_;
578 gchar* _tmp1_ = NULL;
579 gchar* _tmp2_;
580@@ -432,12 +440,12 @@
581 }
582
583
584-static void ___lambda4__app_indicator_scroll_event (AppIndicator* _sender, gint delta, guint direction, gpointer self) {
585- __lambda4_ (self, delta, direction);
586+static void ___lambda6__app_indicator_scroll_event (AppIndicator* _sender, gint delta, guint direction, gpointer self) {
587+ __lambda6_ (self, delta, direction);
588 }
589
590
591-static gboolean __lambda5_ (SimpleClient* self) {
592+static gboolean __lambda7_ (SimpleClient* self) {
593 gboolean result = FALSE;
594 gint _tmp0_;
595 gboolean _tmp1_;
596@@ -470,20 +478,20 @@
597 }
598
599
600-static gboolean ___lambda5__gsource_func (gpointer self) {
601+static gboolean ___lambda7__gsource_func (gpointer self) {
602 gboolean result;
603- result = __lambda5_ (self);
604+ result = __lambda7_ (self);
605 return result;
606 }
607
608
609-static void __lambda6_ (SimpleClient* self) {
610+static void __lambda8_ (SimpleClient* self) {
611 g_print ("1\n");
612 }
613
614
615-static void ___lambda6__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
616- __lambda6_ (self);
617+static void ___lambda8__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
618+ __lambda8_ (self);
619 }
620
621
622@@ -498,29 +506,29 @@
623 }
624
625
626-static void __lambda7_ (SimpleClient* self) {
627+static void __lambda9_ (SimpleClient* self) {
628 g_print ("2\n");
629 }
630
631
632-static void ___lambda7__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
633- __lambda7_ (self);
634+static void ___lambda9__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
635+ __lambda9_ (self);
636 }
637
638
639-static void __lambda8_ (Block2Data* _data2_) {
640+static void __lambda10_ (Block2Data* _data2_) {
641 SimpleClient * self;
642 self = _data2_->self;
643 simple_client_toggle_sensitivity (self, (GtkWidget*) _data2_->submenu);
644 }
645
646
647-static void ___lambda8__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
648- __lambda8_ (self);
649+static void ___lambda10__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
650+ __lambda10_ (self);
651 }
652
653
654-static void __lambda9_ (Block2Data* _data2_) {
655+static void __lambda11_ (Block2Data* _data2_) {
656 SimpleClient * self;
657 GtkWidget* _tmp0_ = NULL;
658 GtkImage* _tmp1_;
659@@ -534,12 +542,12 @@
660 }
661
662
663-static void ___lambda9__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
664- __lambda9_ (self);
665+static void ___lambda11__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
666+ __lambda11_ (self);
667 }
668
669
670-static void __lambda10_ (Block2Data* _data2_) {
671+static void __lambda12_ (Block2Data* _data2_) {
672 SimpleClient * self;
673 gboolean _tmp0_;
674 self = _data2_->self;
675@@ -560,24 +568,24 @@
676 }
677
678
679-static void ___lambda10__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
680- __lambda10_ (self);
681+static void ___lambda12__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
682+ __lambda12_ (self);
683 }
684
685
686-static void __lambda11_ (Block2Data* _data2_) {
687+static void __lambda13_ (Block2Data* _data2_) {
688 SimpleClient * self;
689 self = _data2_->self;
690 simple_client_label_toggle (self, _data2_->show);
691 }
692
693
694-static void ___lambda11__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
695- __lambda11_ (self);
696+static void ___lambda13__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
697+ __lambda13_ (self);
698 }
699
700
701-static void __lambda12_ (Block2Data* _data2_) {
702+static void __lambda14_ (Block2Data* _data2_) {
703 SimpleClient * self;
704 gboolean _tmp0_ = FALSE;
705 self = _data2_->self;
706@@ -594,8 +602,8 @@
707 }
708
709
710-static void ___lambda12__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
711- __lambda12_ (self);
712+static void ___lambda14__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
713+ __lambda14_ (self);
714 }
715
716
717@@ -640,8 +648,8 @@
718 _data2_->_ref_count_ = 1;
719 _data2_->self = simple_client_ref (self);
720 _tmp0_ = self->priv->ci;
721- g_signal_connect (_tmp0_, "scroll-event", (GCallback) ___lambda4__app_indicator_scroll_event, self);
722- g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda5__gsource_func, simple_client_ref (self), simple_client_unref);
723+ g_signal_connect (_tmp0_, "scroll-event", (GCallback) ___lambda6__app_indicator_scroll_event, self);
724+ g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda7__gsource_func, simple_client_ref (self), simple_client_unref);
725 _tmp1_ = (GtkMenu*) gtk_menu_new ();
726 _tmp2_ = g_object_ref_sink (_tmp1_);
727 _g_object_unref0 (self->priv->menu);
728@@ -649,7 +657,7 @@
729 _tmp3_ = (GtkCheckMenuItem*) gtk_check_menu_item_new_with_label ("1");
730 _tmp4_ = g_object_ref_sink (_tmp3_);
731 chk = _tmp4_;
732- g_signal_connect ((GtkMenuItem*) chk, "activate", (GCallback) ___lambda6__gtk_menu_item_activate, self);
733+ g_signal_connect ((GtkMenuItem*) chk, "activate", (GCallback) ___lambda8__gtk_menu_item_activate, self);
734 _tmp5_ = self->priv->menu;
735 gtk_menu_shell_append ((GtkMenuShell*) _tmp5_, (GtkWidget*) ((GtkMenuItem*) chk));
736 gtk_widget_show ((GtkWidget*) chk);
737@@ -659,7 +667,7 @@
738 _tmp9_ = _tmp8_;
739 __g_slist_free__g_object_unref0_0 (_tmp6_);
740 radio = _tmp9_;
741- g_signal_connect ((GtkMenuItem*) radio, "activate", (GCallback) ___lambda7__gtk_menu_item_activate, self);
742+ g_signal_connect ((GtkMenuItem*) radio, "activate", (GCallback) ___lambda9__gtk_menu_item_activate, self);
743 _tmp10_ = self->priv->menu;
744 gtk_menu_shell_append ((GtkMenuShell*) _tmp10_, (GtkWidget*) ((GtkMenuItem*) radio));
745 gtk_widget_show ((GtkWidget*) radio);
746@@ -673,21 +681,21 @@
747 _tmp14_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Toggle 3");
748 _tmp15_ = g_object_ref_sink (_tmp14_);
749 toggle_item = _tmp15_;
750- g_signal_connect_data (toggle_item, "activate", (GCallback) ___lambda8__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
751+ g_signal_connect_data (toggle_item, "activate", (GCallback) ___lambda10__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
752 _tmp16_ = self->priv->menu;
753 gtk_menu_shell_append ((GtkMenuShell*) _tmp16_, (GtkWidget*) toggle_item);
754 gtk_widget_show ((GtkWidget*) toggle_item);
755 _tmp17_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_NEW, NULL);
756 _tmp18_ = g_object_ref_sink (_tmp17_);
757 _data2_->imgitem = _tmp18_;
758- g_signal_connect_data ((GtkMenuItem*) _data2_->imgitem, "activate", (GCallback) ___lambda9__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
759+ g_signal_connect_data ((GtkMenuItem*) _data2_->imgitem, "activate", (GCallback) ___lambda11__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
760 _tmp19_ = self->priv->menu;
761 gtk_menu_shell_append ((GtkMenuShell*) _tmp19_, (GtkWidget*) ((GtkMenuItem*) _data2_->imgitem));
762 gtk_widget_show ((GtkWidget*) _data2_->imgitem);
763 _tmp20_ = (GtkMenuItem*) gtk_menu_item_new_with_label ("Get Attention");
764 _tmp21_ = g_object_ref_sink (_tmp20_);
765 _data2_->att = _tmp21_;
766- g_signal_connect_data (_data2_->att, "activate", (GCallback) ___lambda10__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
767+ g_signal_connect_data (_data2_->att, "activate", (GCallback) ___lambda12__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
768 _tmp22_ = self->priv->menu;
769 gtk_menu_shell_append ((GtkMenuShell*) _tmp22_, (GtkWidget*) _data2_->att);
770 gtk_widget_show ((GtkWidget*) _data2_->att);
771@@ -695,14 +703,14 @@
772 _tmp24_ = g_object_ref_sink (_tmp23_);
773 _data2_->show = _tmp24_;
774 simple_client_label_toggle (self, _data2_->show);
775- g_signal_connect_data (_data2_->show, "activate", (GCallback) ___lambda11__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
776+ g_signal_connect_data (_data2_->show, "activate", (GCallback) ___lambda13__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
777 _tmp25_ = self->priv->menu;
778 gtk_menu_shell_append ((GtkMenuShell*) _tmp25_, (GtkWidget*) _data2_->show);
779 gtk_widget_show ((GtkWidget*) _data2_->show);
780 _tmp26_ = (GtkCheckMenuItem*) gtk_check_menu_item_new_with_label ("Set Local Icon");
781 _tmp27_ = g_object_ref_sink (_tmp26_);
782 _data2_->icon = _tmp27_;
783- g_signal_connect_data ((GtkMenuItem*) _data2_->icon, "activate", (GCallback) ___lambda12__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
784+ g_signal_connect_data ((GtkMenuItem*) _data2_->icon, "activate", (GCallback) ___lambda14__gtk_menu_item_activate, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
785 _tmp28_ = self->priv->menu;
786 gtk_menu_shell_append ((GtkMenuShell*) _tmp28_, (GtkWidget*) ((GtkMenuItem*) _data2_->icon));
787 gtk_widget_show ((GtkWidget*) _data2_->icon);
788
789=== modified file 'example/simple-client-vala.vala'
790--- example/simple-client-vala.vala 2012-01-29 03:38:55 +0000
791+++ example/simple-client-vala.vala 2012-03-21 21:39:25 +0000
792@@ -30,7 +30,7 @@
793 }
794
795 class SimpleClient {
796- Menu menu;
797+ Gtk.Menu menu;
798 Indicator ci;
799 int percentage;
800 bool active;
801@@ -56,24 +56,24 @@
802 widget.set_sensitive(!widget.is_sensitive());
803 }
804
805- private void append_submenu(MenuItem item) {
806- var menu = new Menu();
807- MenuItem mi;
808+ private void append_submenu(Gtk.MenuItem item) {
809+ var menu = new Gtk.Menu();
810+ Gtk.MenuItem mi;
811
812- mi = new MenuItem.with_label("Sub 1");
813+ mi = new Gtk.MenuItem.with_label("Sub 1");
814 menu.append(mi);
815 mi.activate.connect(() => { print("Sub1\n"); });
816
817- MenuItem prev_mi = mi;
818- mi = new MenuItem.with_label("Sub 2");
819+ Gtk.MenuItem prev_mi = mi;
820+ mi = new Gtk.MenuItem.with_label("Sub 2");
821 menu.append(mi);
822 mi.activate.connect(() => { toggle_sensitivity(prev_mi); });
823
824- mi = new MenuItem.with_label("Sub 3");
825+ mi = new Gtk.MenuItem.with_label("Sub 3");
826 menu.append(mi);
827 mi.activate.connect(() => { print("Sub3\n"); });
828
829- mi = new MenuItem.with_label("Toggle Attention");
830+ mi = new Gtk.MenuItem.with_label("Toggle Attention");
831 menu.append(mi);
832 mi.activate.connect(() => {
833 if (ci.get_status() == IndicatorStatus.ATTENTION)
834@@ -88,7 +88,7 @@
835 item.set_submenu(menu);
836 }
837
838- private void label_toggle(MenuItem item) {
839+ private void label_toggle(Gtk.MenuItem item) {
840 can_haz_label = !can_haz_label;
841
842 if (can_haz_label) {
843@@ -114,28 +114,28 @@
844 return true;
845 });
846
847- menu = new Menu();
848+ menu = new Gtk.Menu();
849 var chk = new CheckMenuItem.with_label("1");
850 chk.activate.connect(() => { print("1\n"); });
851 menu.append(chk);
852 chk.show();
853
854- var radio = new RadioMenuItem.with_label(new SList<RadioMenuItem>(), "2");
855+ var radio = new Gtk.RadioMenuItem.with_label(new SList<RadioMenuItem>(), "2");
856 radio.activate.connect(() => { print("2\n"); });
857 menu.append(radio);
858 radio.show();
859
860- var submenu = new MenuItem.with_label("3");
861+ var submenu = new Gtk.MenuItem.with_label("3");
862 menu.append(submenu);
863 append_submenu(submenu);
864 submenu.show();
865
866- var toggle_item = new MenuItem.with_label("Toggle 3");
867+ var toggle_item = new Gtk.MenuItem.with_label("Toggle 3");
868 toggle_item.activate.connect(() => { toggle_sensitivity(submenu); });
869 menu.append(toggle_item);
870 toggle_item.show();
871
872- var imgitem = new ImageMenuItem.from_stock(Stock.NEW, null);
873+ var imgitem = new Gtk.ImageMenuItem.from_stock(Stock.NEW, null);
874 imgitem.activate.connect(() => {
875 Image img = (Image) imgitem.get_image();
876 img.set_from_stock(Stock.OPEN, IconSize.MENU);
877@@ -143,7 +143,7 @@
878 menu.append(imgitem);
879 imgitem.show();
880
881- var att = new MenuItem.with_label("Get Attention");
882+ var att = new Gtk.MenuItem.with_label("Get Attention");
883 att.activate.connect(() => {
884 if (active) {
885 ci.set_status(IndicatorStatus.ATTENTION);
886@@ -158,13 +158,13 @@
887 menu.append(att);
888 att.show();
889
890- var show = new MenuItem.with_label("Show Label");
891+ var show = new Gtk.MenuItem.with_label("Show Label");
892 label_toggle(show);
893 show.activate.connect(() => { label_toggle(show); });
894 menu.append(show);
895 show.show();
896
897- var icon = new CheckMenuItem.with_label("Set Local Icon");
898+ var icon = new Gtk.CheckMenuItem.with_label("Set Local Icon");
899 icon.activate.connect(() => {
900 if (icon.get_active()) {
901 ci.set_icon("simple-client-test-icon.png");
902
903=== modified file 'src/app-indicator.c'
904--- src/app-indicator.c 2012-03-09 18:11:25 +0000
905+++ src/app-indicator.c 2012-03-21 21:39:25 +0000
906@@ -926,11 +926,8 @@
907 break;
908
909 case PROP_DBUS_MENU_SERVER:
910- if (priv->menuservice != NULL) {
911- g_object_unref (priv->menuservice);
912- }
913- gpointer val = g_value_dup_object(value);
914- priv->menuservice = DBUSMENU_SERVER(val);
915+ g_clear_object (&priv->menuservice);
916+ priv->menuservice = DBUSMENU_SERVER (g_value_dup_object(value));
917 break;
918
919 default:

Subscribers

People subscribed via source and target branches