1 |
commit: 6b8f3033e43c505b73270f90b7248b82e6aa38d0 |
2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 22 01:11:42 2011 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 22 01:13:59 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6b8f3033 |
7 |
|
8 |
gnome-base/gnome-shell, net-misc/networkmanager: update live ebuild |
9 |
|
10 |
* Patches were pushed to trunk |
11 |
|
12 |
--- |
13 |
...ch => gnome-shell-experimental-nm-applet.patch} | 0 |
14 |
.../gnome-shell/files/gnome-shell-nm-1.patch | 124 ------------ |
15 |
.../gnome-shell/files/gnome-shell-nm-2.patch | 165 ---------------- |
16 |
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 4 +- |
17 |
.../files/networkmanager-introspection-fixes.patch | 206 -------------------- |
18 |
net-misc/networkmanager/networkmanager-9999.ebuild | 3 - |
19 |
6 files changed, 1 insertions(+), 501 deletions(-) |
20 |
|
21 |
diff --git a/gnome-base/gnome-shell/files/gnome-shell-nm-3.patch b/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet.patch |
22 |
similarity index 100% |
23 |
rename from gnome-base/gnome-shell/files/gnome-shell-nm-3.patch |
24 |
rename to gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet.patch |
25 |
|
26 |
diff --git a/gnome-base/gnome-shell/files/gnome-shell-nm-1.patch b/gnome-base/gnome-shell/files/gnome-shell-nm-1.patch |
27 |
deleted file mode 100644 |
28 |
index 4a7580d..0000000 |
29 |
--- a/gnome-base/gnome-shell/files/gnome-shell-nm-1.patch |
30 |
+++ /dev/null |
31 |
@@ -1,124 +0,0 @@ |
32 |
-From 25884b4b480c18dae05f45e6739241d3e11cd12f Mon Sep 17 00:00:00 2001 |
33 |
-From: Giovanni Campagna <gcampagna@×××××××××.org> |
34 |
-Date: Tue, 25 Jan 2011 22:06:40 +0100 |
35 |
-Subject: [PATCH] PopupMenu: make parameters overridable in items |
36 |
- |
37 |
-Make all subclasses of PopupMenuBase accept a params argument, which |
38 |
-can be used to make the item non reactive, not responsive to hover |
39 |
-and, as a new feature, with a different style class. |
40 |
- |
41 |
-https://bugzilla.gnome.org/show_bug.cgi?id=621707 |
42 |
---- |
43 |
- data/theme/gnome-shell.css | 4 ++++ |
44 |
- js/ui/popupMenu.js | 28 +++++++++++++++++++--------- |
45 |
- js/ui/statusMenu.js | 4 ++-- |
46 |
- 3 files changed, 25 insertions(+), 11 deletions(-) |
47 |
- |
48 |
-diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css |
49 |
-index ba931ad..7bf17d4 100644 |
50 |
---- a/data/theme/gnome-shell.css |
51 |
-+++ b/data/theme/gnome-shell.css |
52 |
-@@ -178,6 +178,10 @@ StTooltip StLabel { |
53 |
- background-image: url("toggle-on-intl.svg"); |
54 |
- } |
55 |
- |
56 |
-+.popup-inactive-menu-item { |
57 |
-+ font-style: italic; |
58 |
-+} |
59 |
-+ |
60 |
- /* Panel */ |
61 |
- |
62 |
- #panel { |
63 |
-diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js |
64 |
-index 30f353e..4e88a2a 100644 |
65 |
---- a/js/ui/popupMenu.js |
66 |
-+++ b/js/ui/popupMenu.js |
67 |
-@@ -55,7 +55,9 @@ PopupBaseMenuItem.prototype = { |
68 |
- _init: function (params) { |
69 |
- params = Params.parse (params, { reactive: true, |
70 |
- activate: true, |
71 |
-- hover: true }); |
72 |
-+ hover: true, |
73 |
-+ style_class: null |
74 |
-+ }); |
75 |
- this.actor = new Shell.GenericContainer({ style_class: 'popup-menu-item', |
76 |
- reactive: params.reactive, |
77 |
- track_hover: params.reactive, |
78 |
-@@ -72,6 +74,9 @@ PopupBaseMenuItem.prototype = { |
79 |
- this._spacing = 0; |
80 |
- this.active = false; |
81 |
- |
82 |
-+ if (params.style_class) |
83 |
-+ this.actor.add_style_class_name(params.style_class); |
84 |
-+ |
85 |
- if (params.reactive && params.activate) { |
86 |
- this.actor.connect('button-release-event', Lang.bind(this, this._onButtonReleaseEvent)); |
87 |
- this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent)); |
88 |
-@@ -533,8 +538,8 @@ function PopupSwitchMenuItem() { |
89 |
- PopupSwitchMenuItem.prototype = { |
90 |
- __proto__: PopupBaseMenuItem.prototype, |
91 |
- |
92 |
-- _init: function(text, active) { |
93 |
-- PopupBaseMenuItem.prototype._init.call(this); |
94 |
-+ _init: function(text, active, params) { |
95 |
-+ PopupBaseMenuItem.prototype._init.call(this, params); |
96 |
- |
97 |
- this.label = new St.Label({ text: text }); |
98 |
- this._switch = new Switch(active); |
99 |
-@@ -562,15 +567,15 @@ PopupSwitchMenuItem.prototype = { |
100 |
- } |
101 |
- |
102 |
- |
103 |
--function PopupImageMenuItem(text, iconName) { |
104 |
-- this._init(text, iconName); |
105 |
-+function PopupImageMenuItem() { |
106 |
-+ this._init.apply(this, arguments); |
107 |
- } |
108 |
- |
109 |
- PopupImageMenuItem.prototype = { |
110 |
- __proto__: PopupBaseMenuItem.prototype, |
111 |
- |
112 |
-- _init: function (text, iconName) { |
113 |
-- PopupBaseMenuItem.prototype._init.call(this); |
114 |
-+ _init: function (text, iconName, params) { |
115 |
-+ PopupBaseMenuItem.prototype._init.call(this, params); |
116 |
- |
117 |
- this.label = new St.Label({ text: text }); |
118 |
- this.addActor(this.label); |
119 |
-@@ -615,8 +620,13 @@ PopupMenuBase.prototype = { |
120 |
- _init: function(sourceActor, styleClass) { |
121 |
- this.sourceActor = sourceActor; |
122 |
- |
123 |
-- this.box = new St.BoxLayout({ style_class: styleClass, |
124 |
-- vertical: true }); |
125 |
-+ // GJS bug: it complains when an optional property is undefined |
126 |
-+ if (styleClass !== undefined) { |
127 |
-+ this.box = new St.BoxLayout({ style_class: styleClass, |
128 |
-+ vertical: true }); |
129 |
-+ } else { |
130 |
-+ this.box = new St.BoxLayout({ vertical: true }); |
131 |
-+ } |
132 |
- |
133 |
- this.isOpen = false; |
134 |
- this._activeMenuItem = null; |
135 |
-diff --git a/js/ui/statusMenu.js b/js/ui/statusMenu.js |
136 |
-index f834aad..9ca5692 100644 |
137 |
---- a/js/ui/statusMenu.js |
138 |
-+++ b/js/ui/statusMenu.js |
139 |
-@@ -99,12 +99,12 @@ StatusMenuButton.prototype = { |
140 |
- _createSubMenu: function() { |
141 |
- let item; |
142 |
- |
143 |
-- item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available', true); |
144 |
-+ item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available'); |
145 |
- item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.AVAILABLE)); |
146 |
- this.menu.addMenuItem(item); |
147 |
- this._presenceItems[GnomeSession.PresenceStatus.AVAILABLE] = item; |
148 |
- |
149 |
-- item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy', true); |
150 |
-+ item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy'); |
151 |
- item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.BUSY)); |
152 |
- this.menu.addMenuItem(item); |
153 |
- this._presenceItems[GnomeSession.PresenceStatus.BUSY] = item; |
154 |
--- |
155 |
-1.7.3.5 |
156 |
\ No newline at end of file |
157 |
|
158 |
diff --git a/gnome-base/gnome-shell/files/gnome-shell-nm-2.patch b/gnome-base/gnome-shell/files/gnome-shell-nm-2.patch |
159 |
deleted file mode 100644 |
160 |
index e711763..0000000 |
161 |
--- a/gnome-base/gnome-shell/files/gnome-shell-nm-2.patch |
162 |
+++ /dev/null |
163 |
@@ -1,165 +0,0 @@ |
164 |
-From fa144c1aa5126097f28d54b91edf488b74b68f79 Mon Sep 17 00:00:00 2001 |
165 |
-From: Giovanni Campagna <gcampagna@×××××××××.org> |
166 |
-Date: Tue, 25 Jan 2011 22:04:57 +0100 |
167 |
-Subject: [PATCH] PopupMenu: introduce PopupMenuSection |
168 |
- |
169 |
-Complex popup menus require the ability to manager sequences of items |
170 |
-as "sections", to which you can add and and remove items, as well |
171 |
-as hide and show. |
172 |
-PopupMenuSection does exactly that, leveraging the existing machinery |
173 |
-for submenus, but without being exposed as a submenu to the user. |
174 |
- |
175 |
-https://bugzilla.gnome.org/show_bug.cgi?id=621707 |
176 |
---- |
177 |
- js/ui/popupMenu.js | 115 +++++++++++++++++++++++++++++++++++++--------------- |
178 |
- 1 files changed, 82 insertions(+), 33 deletions(-) |
179 |
- |
180 |
-diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js |
181 |
-index 4e88a2a..8615c87 100644 |
182 |
---- a/js/ui/popupMenu.js |
183 |
-+++ b/js/ui/popupMenu.js |
184 |
-@@ -640,38 +640,20 @@ PopupMenuBase.prototype = { |
185 |
- })); |
186 |
- }, |
187 |
- |
188 |
-- addMenuItem: function(menuItem, position) { |
189 |
-- let before_item = null; |
190 |
-- if (position == undefined) { |
191 |
-- this.box.add(menuItem.actor); |
192 |
-- } else { |
193 |
-- let items = this.getMenuItems(); |
194 |
-- if (position < items.length) { |
195 |
-- before_item = items[position].actor; |
196 |
-- this.box.insert_before(menuItem.actor, before_item); |
197 |
-- } else |
198 |
-- this.box.add(menuItem.actor); |
199 |
-- } |
200 |
-- if (menuItem instanceof PopupSubMenuMenuItem) { |
201 |
-- if (before_item == null) |
202 |
-- this.box.add(menuItem.menu.actor); |
203 |
-- else |
204 |
-- this.box.insert_before(menuItem.menu.actor, before_item); |
205 |
-- menuItem._subMenuActivateId = menuItem.menu.connect('activate', Lang.bind(this, function() { |
206 |
-- this.emit('activate'); |
207 |
-- this.close(true); |
208 |
-- })); |
209 |
-- menuItem._subMenuActiveChangeId = menuItem.menu.connect('active-changed', Lang.bind(this, function(submenu, submenuItem) { |
210 |
-- if (this._activeMenuItem && this._activeMenuItem != submenuItem) |
211 |
-- this._activeMenuItem.setActive(false); |
212 |
-- this._activeMenuItem = submenuItem; |
213 |
-- this.emit('active-changed', submenuItem); |
214 |
-- })); |
215 |
-- menuItem._closingId = this.connect('open-state-changed', function(self, open) { |
216 |
-- if (!open) |
217 |
-- menuItem.menu.close(false); |
218 |
-- }); |
219 |
-- } |
220 |
-+ _connectSubMenuSignals: function(object, menu) { |
221 |
-+ object._subMenuActivateId = menu.connect('activate', Lang.bind(this, function() { |
222 |
-+ this.emit('activate'); |
223 |
-+ this.close(true); |
224 |
-+ })); |
225 |
-+ object._subMenuActiveChangeId = menu.connect('active-changed', Lang.bind(this, function(submenu, submenuItem) { |
226 |
-+ if (this._activeMenuItem && this._activeMenuItem != submenuItem) |
227 |
-+ this._activeMenuItem.setActive(false); |
228 |
-+ this._activeMenuItem = submenuItem; |
229 |
-+ this.emit('active-changed', submenuItem); |
230 |
-+ })); |
231 |
-+ }, |
232 |
-+ |
233 |
-+ _connectItemSignals: function(menuItem) { |
234 |
- menuItem._activeChangeId = menuItem.connect('active-changed', Lang.bind(this, function (menuItem, active) { |
235 |
- if (active && this._activeMenuItem != menuItem) { |
236 |
- if (this._activeMenuItem) |
237 |
-@@ -700,6 +682,41 @@ PopupMenuBase.prototype = { |
238 |
- })); |
239 |
- }, |
240 |
- |
241 |
-+ addMenuItem: function(menuItem, position) { |
242 |
-+ let before_item = null; |
243 |
-+ if (position == undefined) { |
244 |
-+ this.box.add(menuItem.actor); |
245 |
-+ } else { |
246 |
-+ let items = this.getMenuItems(); |
247 |
-+ if (position < items.length) { |
248 |
-+ before_item = items[position].actor; |
249 |
-+ this.box.insert_before(menuItem.actor, before_item); |
250 |
-+ } else |
251 |
-+ this.box.add(menuItem.actor); |
252 |
-+ } |
253 |
-+ if (menuItem instanceof PopupMenuSection) { |
254 |
-+ this._connectSubMenuSignals(menuItem, menuItem); |
255 |
-+ menuItem.connect('destroy', Lang.bind(this, function() { |
256 |
-+ menuItem.disconnect(menuItem._subMenuActivateId); |
257 |
-+ menuItem.disconnect(menuItem._subMenuActiveChangeId); |
258 |
-+ })); |
259 |
-+ } else if (menuItem instanceof PopupSubMenuMenuItem) { |
260 |
-+ if (before_item == null) |
261 |
-+ this.box.add(menuItem.menu.actor); |
262 |
-+ else |
263 |
-+ this.box.insert_before(menuItem.menu.actor, before_item); |
264 |
-+ this._connectSubMenuSignals(menuItem, menuItem.menu); |
265 |
-+ this._connectItemSignals(menuItem); |
266 |
-+ menuItem._closingId = this.connect('open-state-changed', function(self, open) { |
267 |
-+ if (!open) |
268 |
-+ menuItem.menu.close(false); |
269 |
-+ }); |
270 |
-+ } else if (menuItem instanceof PopupBaseMenuItem) |
271 |
-+ this._connectItemSignals(menuItem); |
272 |
-+ else |
273 |
-+ throw TypeError("Invalid argument to PopupMenuBase.addMenuItem()"); |
274 |
-+ }, |
275 |
-+ |
276 |
- getColumnWidths: function() { |
277 |
- let columnWidths = []; |
278 |
- let items = this.box.get_children(); |
279 |
-@@ -728,7 +745,11 @@ PopupMenuBase.prototype = { |
280 |
- }, |
281 |
- |
282 |
- getMenuItems: function() { |
283 |
-- return this.box.get_children().map(function (actor) { return actor._delegate; }).filter(function(item) { return item instanceof PopupBaseMenuItem; }); |
284 |
-+ return this.box.get_children().map(function (actor) { |
285 |
-+ return actor._delegate; |
286 |
-+ }).filter(function(item) { |
287 |
-+ return item instanceof PopupBaseMenuItem || item instanceof PopupMenuSection; |
288 |
-+ }); |
289 |
- }, |
290 |
- |
291 |
- removeAll: function() { |
292 |
-@@ -943,6 +964,34 @@ PopupSubMenu.prototype = { |
293 |
- } |
294 |
- }; |
295 |
- |
296 |
-+/** |
297 |
-+ * PopupMenuSection: |
298 |
-+ * |
299 |
-+ * A section of a PopupMenu which is handled like a submenu |
300 |
-+ * (you can add and remove items, you can destroy it, you |
301 |
-+ * can add it to another menu), but is completely transparent |
302 |
-+ * to the user |
303 |
-+ */ |
304 |
-+function PopupMenuSection() { |
305 |
-+ this._init.apply(this, arguments); |
306 |
-+} |
307 |
-+ |
308 |
-+PopupMenuSection.prototype = { |
309 |
-+ __proto__: PopupMenuBase.prototype, |
310 |
-+ |
311 |
-+ _init: function() { |
312 |
-+ PopupMenuBase.prototype._init.call(this); |
313 |
-+ |
314 |
-+ this.actor = this.box; |
315 |
-+ this.actor._delegate = this; |
316 |
-+ this.isOpen = true; |
317 |
-+ }, |
318 |
-+ |
319 |
-+ // deliberately ignore any attempt to open() or close() |
320 |
-+ open: function(animate) { }, |
321 |
-+ close: function() { }, |
322 |
-+} |
323 |
-+ |
324 |
- function PopupSubMenuMenuItem() { |
325 |
- this._init.apply(this, arguments); |
326 |
- } |
327 |
--- |
328 |
-1.7.3.5 |
329 |
\ No newline at end of file |
330 |
|
331 |
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
332 |
index 82a86b4..c90dc8e 100644 |
333 |
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
334 |
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
335 |
@@ -85,9 +85,7 @@ src_prepare() { |
336 |
ewarn "Adding support for the experimental NetworkManager applet." |
337 |
ewarn "This needs the latest NetworkManager & nm-applet trunk." |
338 |
ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeNode." |
339 |
- epatch "${FILESDIR}/${PN}-nm-1.patch" |
340 |
- epatch "${FILESDIR}/${PN}-nm-2.patch" |
341 |
- epatch "${FILESDIR}/${PN}-nm-3.patch" |
342 |
+ epatch "${FILESDIR}/${PN}-experimental-nm-applet.patch" |
343 |
fi |
344 |
|
345 |
gnome2_src_prepare |
346 |
|
347 |
diff --git a/net-misc/networkmanager/files/networkmanager-introspection-fixes.patch b/net-misc/networkmanager/files/networkmanager-introspection-fixes.patch |
348 |
deleted file mode 100644 |
349 |
index 2c5befc..0000000 |
350 |
--- a/net-misc/networkmanager/files/networkmanager-introspection-fixes.patch |
351 |
+++ /dev/null |
352 |
@@ -1,206 +0,0 @@ |
353 |
-From dbd3c269d04413deb79a72f688af77ea299d2205 Mon Sep 17 00:00:00 2001 |
354 |
-From: Giovanni Campagna <gcampagna@×××××××××.org> |
355 |
-Date: Sat, 11 Dec 2010 18:05:30 +0100 |
356 |
-Subject: [PATCH] More GObjectIntrospection fixes |
357 |
- |
358 |
-Fix some annotations and add the necessary ones for new functions. |
359 |
- |
360 |
-https://bugzilla.gnome.org/show_bug.cgi?id=637032 |
361 |
---- |
362 |
- libnm-glib/nm-client.c | 5 +++-- |
363 |
- libnm-glib/nm-dhcp4-config.c | 2 ++ |
364 |
- libnm-glib/nm-dhcp6-config.c | 2 ++ |
365 |
- libnm-glib/nm-remote-connection.c | 9 +++++++++ |
366 |
- libnm-glib/nm-secret-agent.c | 37 +++++++++++++++++++++++++++++++++++++ |
367 |
- libnm-util/nm-connection.c | 17 +++++++++-------- |
368 |
- libnm-util/nm-setting-vpn.h | 2 -- |
369 |
- 7 files changed, 62 insertions(+), 12 deletions(-) |
370 |
- |
371 |
-diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c |
372 |
-index 4e725cf..bab86a9 100644 |
373 |
---- a/libnm-glib/nm-client.c |
374 |
-+++ b/libnm-glib/nm-client.c |
375 |
-@@ -1152,8 +1152,9 @@ activate_cb (DBusGProxy *proxy, |
376 |
- * @client: a #NMClient |
377 |
- * @connection_path: the connection's DBus path |
378 |
- * @device: the #NMDevice |
379 |
-- * @specific_object: the device specific object (currently used only for |
380 |
-- * activating wireless devices and should be the #NMAccessPoint<!-- -->'s path. |
381 |
-+ * @specific_object: (allow-none): the device specific object (currently |
382 |
-+ * used only for activating wireless devices and should be the |
383 |
-+ * #NMAccessPoint<!-- -->'s path). |
384 |
- * @callback: (scope async): the function to call when the call is done |
385 |
- * @user_data: user data to pass to the callback function |
386 |
- * |
387 |
-diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c |
388 |
-index d17578a..31dfe25 100644 |
389 |
---- a/libnm-glib/nm-dhcp4-config.c |
390 |
-+++ b/libnm-glib/nm-dhcp4-config.c |
391 |
-@@ -169,6 +169,8 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class) |
392 |
- * NMDHCP4Config:options: |
393 |
- * |
394 |
- * The #GHashTable containing options of the configuration. |
395 |
-+ * |
396 |
-+ * Type: GHashTable<utf8,GValue> |
397 |
- **/ |
398 |
- g_object_class_install_property |
399 |
- (object_class, PROP_OPTIONS, |
400 |
-diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c |
401 |
-index 8b85595..7e6e4f8 100644 |
402 |
---- a/libnm-glib/nm-dhcp6-config.c |
403 |
-+++ b/libnm-glib/nm-dhcp6-config.c |
404 |
-@@ -169,6 +169,8 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class) |
405 |
- * NMDHCP6Config:options: |
406 |
- * |
407 |
- * The #GHashTable containing options of the configuration. |
408 |
-+ * |
409 |
-+ * Type: GHashTable<utf8,GValue> |
410 |
- **/ |
411 |
- g_object_class_install_property |
412 |
- (object_class, PROP_OPTIONS, |
413 |
-diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c |
414 |
-index 09c7112..1869a3a 100644 |
415 |
---- a/libnm-glib/nm-remote-connection.c |
416 |
-+++ b/libnm-glib/nm-remote-connection.c |
417 |
-@@ -480,6 +480,15 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) |
418 |
- G_PARAM_READABLE)); |
419 |
- |
420 |
- /* Signals */ |
421 |
-+ /** |
422 |
-+ * NMRemoteConnection::updated: |
423 |
-+ * @connection: a #NMConnection |
424 |
-+ * @new_settings: (type GHashTable<utf8,GHashTable<utf8,GValue>>): |
425 |
-+ * the updated settings |
426 |
-+ * |
427 |
-+ * This signal is emitted when a connection changes, and it is |
428 |
-+ * still visible to the user. |
429 |
-+ */ |
430 |
- signals[UPDATED] = |
431 |
- g_signal_new (NM_REMOTE_CONNECTION_UPDATED, |
432 |
- G_TYPE_FROM_CLASS (remote_class), |
433 |
-diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c |
434 |
-index 72431e2..9cc2440 100644 |
435 |
---- a/libnm-glib/nm-secret-agent.c |
436 |
-+++ b/libnm-glib/nm-secret-agent.c |
437 |
-@@ -567,6 +567,20 @@ auto_register_cb (gpointer user_data) |
438 |
- |
439 |
- /**************************************************************/ |
440 |
- |
441 |
-+/** |
442 |
-+ * nm_secret_agent_get_secrets: |
443 |
-+ * @self: a #NMSecretAgent |
444 |
-+ * @connection: the #NMConnection for which we're asked secrets |
445 |
-+ * @setting_name: the name of the secret setting |
446 |
-+ * @hints: (array zero-terminated=1): hints to the agent |
447 |
-+ * @flags: |
448 |
-+ * @callback: (scope async): a callback, invoked when the operation is done |
449 |
-+ * @callback_data: (closure): |
450 |
-+ * |
451 |
-+ * Asyncronously retrieve @setting_name from @connection |
452 |
-+ * |
453 |
-+ * VFunc: get_secrets |
454 |
-+ */ |
455 |
- void |
456 |
- nm_secret_agent_get_secrets (NMSecretAgent *self, |
457 |
- NMConnection *connection, |
458 |
-@@ -595,6 +609,18 @@ nm_secret_agent_get_secrets (NMSecretAgent *self, |
459 |
- callback_data); |
460 |
- } |
461 |
- |
462 |
-+/** |
463 |
-+ * nm_secret_agent_save_secrets: |
464 |
-+ * @self: a #NMSecretAgent |
465 |
-+ * @connection: a #NMConnection |
466 |
-+ * @callback: (scope async): a callback, invoked when the operation is done |
467 |
-+ * @callback_data: (closure): |
468 |
-+ * |
469 |
-+ * Asyncronously ensure that all secrets inside @connection |
470 |
-+ * are stored to disk. |
471 |
-+ * |
472 |
-+ * VFunc: save_secrets |
473 |
-+ */ |
474 |
- void |
475 |
- nm_secret_agent_save_secrets (NMSecretAgent *self, |
476 |
- NMConnection *connection, |
477 |
-@@ -614,6 +640,17 @@ nm_secret_agent_save_secrets (NMSecretAgent *self, |
478 |
- callback_data); |
479 |
- } |
480 |
- |
481 |
-+/** |
482 |
-+ * nm_secret_agent_delete_secrets: |
483 |
-+ * @self: a #NMSecretAgent |
484 |
-+ * @connection: a #NMConnection |
485 |
-+ * @callback: (scope async): a callback, invoked when the operation is done |
486 |
-+ * @callback_data: (closure): |
487 |
-+ * |
488 |
-+ * Asyncronously remove all secret settings from @connection |
489 |
-+ * |
490 |
-+ * VFunc: delete_secrets |
491 |
-+ */ |
492 |
- void |
493 |
- nm_secret_agent_delete_secrets (NMSecretAgent *self, |
494 |
- NMConnection *connection, |
495 |
-diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c |
496 |
-index ec33907..aef1cc0 100644 |
497 |
---- a/libnm-util/nm-connection.c |
498 |
-+++ b/libnm-util/nm-connection.c |
499 |
-@@ -493,7 +493,7 @@ validate_permissions_type (GHashTable *hash, GError **error) |
500 |
- /** |
501 |
- * nm_connection_replace_settings: |
502 |
- * @connection: a #NMConnection |
503 |
-- * @new_settings: (element-type utf8 GLib.HashTable): a #GHashTable of settings |
504 |
-+ * @new_settings: (element-type utf8 GHashTable<utf8,GValue>): a #GHashTable of settings |
505 |
- * @error: location to store error, or %NULL |
506 |
- * |
507 |
- * Returns: %TRUE if the settings were valid and added to the connection, %FALSE |
508 |
-@@ -728,11 +728,12 @@ add_setting_to_list (gpointer key, gpointer data, gpointer user_data) |
509 |
- /** |
510 |
- * nm_connection_need_secrets: |
511 |
- * @connection: the #NMConnection |
512 |
-- * @hints: the address of a pointer to a #GPtrArray, initialized to NULL, which |
513 |
-- * on return points to an allocated #GPtrArray containing the property names of |
514 |
-- * secrets of the #NMSetting which may be required; the caller owns the array |
515 |
-- * and must free the each array element with g_free(), as well as the array |
516 |
-- * itself with g_ptr_array_free() |
517 |
-+ * @hints: (out callee-allocates) (element-type utf8) (allow-none) (transfer full): |
518 |
-+ * the address of a pointer to a #GPtrArray, initialized to NULL, which on |
519 |
-+ * return points to an allocated #GPtrArray containing the property names of |
520 |
-+ * secrets of the #NMSetting which may be required; the caller owns the array |
521 |
-+ * and must free the each array element with g_free(), as well as the array |
522 |
-+ * itself with g_ptr_array_free() |
523 |
- * |
524 |
- * Returns the name of the first setting object in the connection which would |
525 |
- * need secrets to make a successful connection. The returned hints are only |
526 |
-@@ -741,7 +742,7 @@ add_setting_to_list (gpointer key, gpointer data, gpointer user_data) |
527 |
- * secrets are needed. |
528 |
- * |
529 |
- * Returns: the setting name of the #NMSetting object which has invalid or |
530 |
-- * missing secrets |
531 |
-+ * missing secrets |
532 |
- **/ |
533 |
- const char * |
534 |
- nm_connection_need_secrets (NMConnection *connection, |
535 |
-@@ -821,7 +822,7 @@ nm_connection_clear_secrets (NMConnection *connection) |
536 |
- * are #GHashTables mapping string:GValue, each of which represents the |
537 |
- * properties of the #NMSetting object. |
538 |
- * |
539 |
-- * Returns: (transfer full) (element-type utf8 GLib.HashTable): a new |
540 |
-+ * Returns: (transfer full) (element-type utf8 GHashTable<utf8,GValue>): a new |
541 |
- * #GHashTable describing the connection, its settings, and each setting's |
542 |
- * properties. The caller owns the hash table and must unref the hash table |
543 |
- * with g_hash_table_unref() when it is no longer needed. |
544 |
-diff --git a/libnm-util/nm-setting-vpn.h b/libnm-util/nm-setting-vpn.h |
545 |
-index bb20356..6ff1928 100644 |
546 |
---- a/libnm-util/nm-setting-vpn.h |
547 |
-+++ b/libnm-util/nm-setting-vpn.h |
548 |
-@@ -72,8 +72,6 @@ typedef struct { |
549 |
- } NMSettingVPNClass; |
550 |
- |
551 |
- typedef void (*NMVPNIterFunc) (const char *key, const char *value, gpointer user_data); |
552 |
--/* For backward compatibility */ |
553 |
--typedef NMVPNIterFunc VPNIterFunc; |
554 |
- |
555 |
- GType nm_setting_vpn_get_type (void); |
556 |
- |
557 |
--- |
558 |
-1.7.4 |
559 |
\ No newline at end of file |
560 |
|
561 |
diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild |
562 |
index f0f5095..d4bbdd6 100644 |
563 |
--- a/net-misc/networkmanager/networkmanager-9999.ebuild |
564 |
+++ b/net-misc/networkmanager/networkmanager-9999.ebuild |
565 |
@@ -133,9 +133,6 @@ src_prepare() { |
566 |
# FIXME: does not apply |
567 |
#epatch "${FILESDIR}/${PN}-0.8.2-shared-connection.patch" |
568 |
|
569 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=637032 |
570 |
- epatch "${FILESDIR}/${PN}-introspection-fixes.patch" |
571 |
- |
572 |
gnome2_src_prepare |
573 |
} |