[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, net-misc/networkmanager/, ...

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     6b8f3033e43c505b73270f90b7248b82e6aa38d0
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 01:11:42 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 01:13:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6b8f3033

gnome-base/gnome-shell, net-misc/networkmanager: update live ebuild

* Patches were pushed to trunk

---
 ...ch => gnome-shell-experimental-nm-applet.patch} |    0
 .../gnome-shell/files/gnome-shell-nm-1.patch       |  124 ------------
 .../gnome-shell/files/gnome-shell-nm-2.patch       |  165 ----------------
 gnome-base/gnome-shell/gnome-shell-9999.ebuild     |    4 +-
 .../files/networkmanager-introspection-fixes.patch |  206 --------------------
 net-misc/networkmanager/networkmanager-9999.ebuild |    3 -
 6 files changed, 1 insertions(+), 501 deletions(-)

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
similarity index 100%
rename from gnome-base/gnome-shell/files/gnome-shell-nm-3.patch
rename to gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet.patch

diff --git a/gnome-base/gnome-shell/files/gnome-shell-nm-1.patch b/gnome-base/gnome-shell/files/gnome-shell-nm-1.patch
deleted file mode 100644
index 4a7580d..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-nm-1.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 25884b4b480c18dae05f45e6739241d3e11cd12f Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Tue, 25 Jan 2011 22:06:40 +0100
-Subject: [PATCH] PopupMenu: make parameters overridable in items
-
-Make all subclasses of PopupMenuBase accept a params argument, which
-can be used to make the item non reactive, not responsive to hover
-and, as a new feature, with a different style class.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=621707
----
- data/theme/gnome-shell.css |    4 ++++
- js/ui/popupMenu.js         |   28 +++++++++++++++++++---------
- js/ui/statusMenu.js        |    4 ++--
- 3 files changed, 25 insertions(+), 11 deletions(-)
-
-diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
-index ba931ad..7bf17d4 100644
---- a/data/theme/gnome-shell.css
-+++ b/data/theme/gnome-shell.css
-@@ -178,6 +178,10 @@ StTooltip StLabel {
-     background-image: url("toggle-on-intl.svg");
- }
- 
-+.popup-inactive-menu-item {
-+	font-style: italic;
-+}
-+
- /* Panel */
- 
- #panel {
-diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
-index 30f353e..4e88a2a 100644
---- a/js/ui/popupMenu.js
-+++ b/js/ui/popupMenu.js
-@@ -55,7 +55,9 @@ PopupBaseMenuItem.prototype = {
-     _init: function (params) {
-         params = Params.parse (params, { reactive: true,
-                                          activate: true,
--                                         hover: true });
-+                                         hover: true,
-+                                         style_class: null
-+                                       });
-         this.actor = new Shell.GenericContainer({ style_class: 'popup-menu-item',
-                                                   reactive: params.reactive,
-                                                   track_hover: params.reactive,
-@@ -72,6 +74,9 @@ PopupBaseMenuItem.prototype = {
-         this._spacing = 0;
-         this.active = false;
- 
-+        if (params.style_class)
-+            this.actor.add_style_class_name(params.style_class);
-+
-         if (params.reactive && params.activate) {
-             this.actor.connect('button-release-event', Lang.bind(this, this._onButtonReleaseEvent));
-             this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
-@@ -533,8 +538,8 @@ function PopupSwitchMenuItem() {
- PopupSwitchMenuItem.prototype = {
-     __proto__: PopupBaseMenuItem.prototype,
- 
--    _init: function(text, active) {
--        PopupBaseMenuItem.prototype._init.call(this);
-+    _init: function(text, active, params) {
-+        PopupBaseMenuItem.prototype._init.call(this, params);
- 
-         this.label = new St.Label({ text: text });
-         this._switch = new Switch(active);
-@@ -562,15 +567,15 @@ PopupSwitchMenuItem.prototype = {
- }
- 
- 
--function PopupImageMenuItem(text, iconName) {
--    this._init(text, iconName);
-+function PopupImageMenuItem() {
-+    this._init.apply(this, arguments);
- }
- 
- PopupImageMenuItem.prototype = {
-     __proto__: PopupBaseMenuItem.prototype,
- 
--    _init: function (text, iconName) {
--        PopupBaseMenuItem.prototype._init.call(this);
-+    _init: function (text, iconName, params) {
-+        PopupBaseMenuItem.prototype._init.call(this, params);
- 
-         this.label = new St.Label({ text: text });
-         this.addActor(this.label);
-@@ -615,8 +620,13 @@ PopupMenuBase.prototype = {
-     _init: function(sourceActor, styleClass) {
-         this.sourceActor = sourceActor;
- 
--        this.box = new St.BoxLayout({ style_class: styleClass,
--                                      vertical: true });
-+        // GJS bug: it complains when an optional property is undefined
-+        if (styleClass !== undefined) {
-+            this.box = new St.BoxLayout({ style_class: styleClass,
-+                                          vertical: true });
-+        } else {
-+            this.box = new St.BoxLayout({ vertical: true });
-+        }
- 
-         this.isOpen = false;
-         this._activeMenuItem = null;
-diff --git a/js/ui/statusMenu.js b/js/ui/statusMenu.js
-index f834aad..9ca5692 100644
---- a/js/ui/statusMenu.js
-+++ b/js/ui/statusMenu.js
-@@ -99,12 +99,12 @@ StatusMenuButton.prototype = {
-     _createSubMenu: function() {
-         let item;
- 
--        item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available', true);
-+        item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available');
-         item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.AVAILABLE));
-         this.menu.addMenuItem(item);
-         this._presenceItems[GnomeSession.PresenceStatus.AVAILABLE] = item;
- 
--        item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy', true);
-+        item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy');
-         item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.BUSY));
-         this.menu.addMenuItem(item);
-         this._presenceItems[GnomeSession.PresenceStatus.BUSY] = item;
--- 
-1.7.3.5
\ No newline at end of file

diff --git a/gnome-base/gnome-shell/files/gnome-shell-nm-2.patch b/gnome-base/gnome-shell/files/gnome-shell-nm-2.patch
deleted file mode 100644
index e711763..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-nm-2.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fa144c1aa5126097f28d54b91edf488b74b68f79 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Tue, 25 Jan 2011 22:04:57 +0100
-Subject: [PATCH] PopupMenu: introduce PopupMenuSection
-
-Complex popup menus require the ability to manager sequences of items
-as "sections", to which you can add and and remove items, as well
-as hide and show.
-PopupMenuSection does exactly that, leveraging the existing machinery
-for submenus, but without being exposed as a submenu to the user.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=621707
----
- js/ui/popupMenu.js |  115 +++++++++++++++++++++++++++++++++++++---------------
- 1 files changed, 82 insertions(+), 33 deletions(-)
-
-diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
-index 4e88a2a..8615c87 100644
---- a/js/ui/popupMenu.js
-+++ b/js/ui/popupMenu.js
-@@ -640,38 +640,20 @@ PopupMenuBase.prototype = {
-         }));
-     },
- 
--    addMenuItem: function(menuItem, position) {
--        let before_item = null;
--        if (position == undefined) {
--            this.box.add(menuItem.actor);
--        } else {
--            let items = this.getMenuItems();
--            if (position < items.length) {
--                before_item = items[position].actor;
--                this.box.insert_before(menuItem.actor, before_item);
--            } else
--                this.box.add(menuItem.actor);
--        }
--        if (menuItem instanceof PopupSubMenuMenuItem) {
--            if (before_item == null)
--                this.box.add(menuItem.menu.actor);
--            else
--                this.box.insert_before(menuItem.menu.actor, before_item);
--            menuItem._subMenuActivateId = menuItem.menu.connect('activate', Lang.bind(this, function() {
--                this.emit('activate');
--                this.close(true);
--            }));
--            menuItem._subMenuActiveChangeId = menuItem.menu.connect('active-changed', Lang.bind(this, function(submenu, submenuItem) {
--                if (this._activeMenuItem && this._activeMenuItem != submenuItem)
--                    this._activeMenuItem.setActive(false);
--                this._activeMenuItem = submenuItem;
--                this.emit('active-changed', submenuItem);
--            }));
--            menuItem._closingId = this.connect('open-state-changed', function(self, open) {
--                if (!open)
--                    menuItem.menu.close(false);
--            });
--        }
-+    _connectSubMenuSignals: function(object, menu) {
-+        object._subMenuActivateId = menu.connect('activate', Lang.bind(this, function() {
-+            this.emit('activate');
-+            this.close(true);
-+        }));
-+        object._subMenuActiveChangeId = menu.connect('active-changed', Lang.bind(this, function(submenu, submenuItem) {
-+            if (this._activeMenuItem && this._activeMenuItem != submenuItem)
-+                this._activeMenuItem.setActive(false);
-+            this._activeMenuItem = submenuItem;
-+            this.emit('active-changed', submenuItem);
-+        }));
-+    },
-+
-+    _connectItemSignals: function(menuItem) {
-         menuItem._activeChangeId = menuItem.connect('active-changed', Lang.bind(this, function (menuItem, active) {
-             if (active && this._activeMenuItem != menuItem) {
-                 if (this._activeMenuItem)
-@@ -700,6 +682,41 @@ PopupMenuBase.prototype = {
-         }));
-     },
- 
-+    addMenuItem: function(menuItem, position) {
-+        let before_item = null;
-+        if (position == undefined) {
-+            this.box.add(menuItem.actor);
-+        } else {
-+            let items = this.getMenuItems();
-+            if (position < items.length) {
-+                before_item = items[position].actor;
-+                this.box.insert_before(menuItem.actor, before_item);
-+            } else
-+                this.box.add(menuItem.actor);
-+        }
-+        if (menuItem instanceof PopupMenuSection) {
-+            this._connectSubMenuSignals(menuItem, menuItem);
-+            menuItem.connect('destroy', Lang.bind(this, function() {
-+                menuItem.disconnect(menuItem._subMenuActivateId);
-+                menuItem.disconnect(menuItem._subMenuActiveChangeId);
-+            }));
-+        } else if (menuItem instanceof PopupSubMenuMenuItem) {
-+            if (before_item == null)
-+                this.box.add(menuItem.menu.actor);
-+            else
-+                this.box.insert_before(menuItem.menu.actor, before_item);
-+            this._connectSubMenuSignals(menuItem, menuItem.menu);
-+            this._connectItemSignals(menuItem);
-+            menuItem._closingId = this.connect('open-state-changed', function(self, open) {
-+                if (!open)
-+                    menuItem.menu.close(false);
-+            });
-+        } else if (menuItem instanceof PopupBaseMenuItem)
-+            this._connectItemSignals(menuItem);
-+        else
-+            throw TypeError("Invalid argument to PopupMenuBase.addMenuItem()");
-+    },
-+
-     getColumnWidths: function() {
-         let columnWidths = [];
-         let items = this.box.get_children();
-@@ -728,7 +745,11 @@ PopupMenuBase.prototype = {
-     },
- 
-     getMenuItems: function() {
--        return this.box.get_children().map(function (actor) { return actor._delegate; }).filter(function(item) { return item instanceof PopupBaseMenuItem; });
-+        return this.box.get_children().map(function (actor) {
-+            return actor._delegate;
-+        }).filter(function(item) {
-+            return item instanceof PopupBaseMenuItem || item instanceof PopupMenuSection;
-+        });
-     },
- 
-     removeAll: function() {
-@@ -943,6 +964,34 @@ PopupSubMenu.prototype = {
-     }
- };
- 
-+/**
-+ * PopupMenuSection:
-+ *
-+ * A section of a PopupMenu which is handled like a submenu
-+ * (you can add and remove items, you can destroy it, you
-+ * can add it to another menu), but is completely transparent
-+ * to the user
-+ */
-+function PopupMenuSection() {
-+    this._init.apply(this, arguments);
-+}
-+
-+PopupMenuSection.prototype = {
-+    __proto__: PopupMenuBase.prototype,
-+
-+    _init: function() {
-+        PopupMenuBase.prototype._init.call(this);
-+
-+        this.actor = this.box;
-+        this.actor._delegate = this;
-+        this.isOpen = true;
-+    },
-+
-+    // deliberately ignore any attempt to open() or close()
-+    open: function(animate) { },
-+    close: function() { },
-+}
-+
- function PopupSubMenuMenuItem() {
-     this._init.apply(this, arguments);
- }
--- 
-1.7.3.5
\ No newline at end of file

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 82a86b4..c90dc8e 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -85,9 +85,7 @@ src_prepare() {
 		ewarn "Adding support for the experimental NetworkManager applet."
 		ewarn "This needs the latest NetworkManager & nm-applet trunk."
 		ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeNode."
-		epatch "${FILESDIR}/${PN}-nm-1.patch"
-		epatch "${FILESDIR}/${PN}-nm-2.patch"
-		epatch "${FILESDIR}/${PN}-nm-3.patch"
+		epatch "${FILESDIR}/${PN}-experimental-nm-applet.patch"
 	fi
 
 	gnome2_src_prepare

diff --git a/net-misc/networkmanager/files/networkmanager-introspection-fixes.patch b/net-misc/networkmanager/files/networkmanager-introspection-fixes.patch
deleted file mode 100644
index 2c5befc..0000000
--- a/net-misc/networkmanager/files/networkmanager-introspection-fixes.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From dbd3c269d04413deb79a72f688af77ea299d2205 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Sat, 11 Dec 2010 18:05:30 +0100
-Subject: [PATCH] More GObjectIntrospection fixes
-
-Fix some annotations and add the necessary ones for new functions.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=637032
----
- libnm-glib/nm-client.c            |    5 +++--
- libnm-glib/nm-dhcp4-config.c      |    2 ++
- libnm-glib/nm-dhcp6-config.c      |    2 ++
- libnm-glib/nm-remote-connection.c |    9 +++++++++
- libnm-glib/nm-secret-agent.c      |   37 +++++++++++++++++++++++++++++++++++++
- libnm-util/nm-connection.c        |   17 +++++++++--------
- libnm-util/nm-setting-vpn.h       |    2 --
- 7 files changed, 62 insertions(+), 12 deletions(-)
-
-diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
-index 4e725cf..bab86a9 100644
---- a/libnm-glib/nm-client.c
-+++ b/libnm-glib/nm-client.c
-@@ -1152,8 +1152,9 @@ activate_cb (DBusGProxy *proxy,
-  * @client: a #NMClient
-  * @connection_path: the connection's DBus path
-  * @device: the #NMDevice
-- * @specific_object: the device specific object (currently used only for
-- * activating wireless devices and should be the #NMAccessPoint<!-- -->'s path.
-+ * @specific_object: (allow-none): the device specific object (currently
-+ *   used only for activating wireless devices and should be the
-+ *   #NMAccessPoint<!-- -->'s path).
-  * @callback: (scope async): the function to call when the call is done
-  * @user_data: user data to pass to the callback function
-  *
-diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c
-index d17578a..31dfe25 100644
---- a/libnm-glib/nm-dhcp4-config.c
-+++ b/libnm-glib/nm-dhcp4-config.c
-@@ -169,6 +169,8 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class)
- 	 * NMDHCP4Config:options:
- 	 *
- 	 * The #GHashTable containing options of the configuration.
-+	 *
-+	 * Type: GHashTable<utf8,GValue>
- 	 **/
- 	g_object_class_install_property
- 		(object_class, PROP_OPTIONS,
-diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c
-index 8b85595..7e6e4f8 100644
---- a/libnm-glib/nm-dhcp6-config.c
-+++ b/libnm-glib/nm-dhcp6-config.c
-@@ -169,6 +169,8 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class)
- 	 * NMDHCP6Config:options:
- 	 *
- 	 * The #GHashTable containing options of the configuration.
-+	 *
-+	 * Type: GHashTable<utf8,GValue>
- 	 **/
- 	g_object_class_install_property
- 		(object_class, PROP_OPTIONS,
-diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
-index 09c7112..1869a3a 100644
---- a/libnm-glib/nm-remote-connection.c
-+++ b/libnm-glib/nm-remote-connection.c
-@@ -480,6 +480,15 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class)
- 		                    G_PARAM_READABLE));
- 
- 	/* Signals */
-+    /**
-+     * NMRemoteConnection::updated:
-+     * @connection: a #NMConnection
-+     * @new_settings: (type GHashTable<utf8,GHashTable<utf8,GValue>>):
-+     *                the updated settings
-+     *
-+     * This signal is emitted when a connection changes, and it is
-+     * still visible to the user.
-+     */
- 	signals[UPDATED] = 
- 		g_signal_new (NM_REMOTE_CONNECTION_UPDATED,
- 		              G_TYPE_FROM_CLASS (remote_class),
-diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
-index 72431e2..9cc2440 100644
---- a/libnm-glib/nm-secret-agent.c
-+++ b/libnm-glib/nm-secret-agent.c
-@@ -567,6 +567,20 @@ auto_register_cb (gpointer user_data)
- 
- /**************************************************************/
- 
-+/**
-+ * nm_secret_agent_get_secrets:
-+ * @self: a #NMSecretAgent
-+ * @connection: the #NMConnection for which we're asked secrets
-+ * @setting_name: the name of the secret setting
-+ * @hints: (array zero-terminated=1): hints to the agent
-+ * @flags:
-+ * @callback: (scope async): a callback, invoked when the operation is done
-+ * @callback_data: (closure):
-+ *
-+ * Asyncronously retrieve @setting_name from @connection
-+ *
-+ * VFunc: get_secrets
-+ */
- void
- nm_secret_agent_get_secrets (NMSecretAgent *self,
-                              NMConnection *connection,
-@@ -595,6 +609,18 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
- 	                                               callback_data);
- }
- 
-+/**
-+ * nm_secret_agent_save_secrets:
-+ * @self: a #NMSecretAgent
-+ * @connection: a #NMConnection
-+ * @callback: (scope async): a callback, invoked when the operation is done
-+ * @callback_data: (closure):
-+ *
-+ * Asyncronously ensure that all secrets inside @connection
-+ * are stored to disk.
-+ *
-+ * VFunc: save_secrets
-+ */
- void
- nm_secret_agent_save_secrets (NMSecretAgent *self,
-                               NMConnection *connection,
-@@ -614,6 +640,17 @@ nm_secret_agent_save_secrets (NMSecretAgent *self,
- 	                                                callback_data);
- }
- 
-+/**
-+ * nm_secret_agent_delete_secrets:
-+ * @self: a #NMSecretAgent
-+ * @connection: a #NMConnection
-+ * @callback: (scope async): a callback, invoked when the operation is done
-+ * @callback_data: (closure):
-+ *
-+ * Asyncronously remove all secret settings from @connection
-+ *
-+ * VFunc: delete_secrets
-+ */
- void
- nm_secret_agent_delete_secrets (NMSecretAgent *self,
-                                 NMConnection *connection,
-diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
-index ec33907..aef1cc0 100644
---- a/libnm-util/nm-connection.c
-+++ b/libnm-util/nm-connection.c
-@@ -493,7 +493,7 @@ validate_permissions_type (GHashTable *hash, GError **error)
- /**
-  * nm_connection_replace_settings:
-  * @connection: a #NMConnection
-- * @new_settings: (element-type utf8 GLib.HashTable): a #GHashTable of settings
-+ * @new_settings: (element-type utf8 GHashTable<utf8,GValue>): a #GHashTable of settings
-  * @error: location to store error, or %NULL
-  *
-  * Returns: %TRUE if the settings were valid and added to the connection, %FALSE
-@@ -728,11 +728,12 @@ add_setting_to_list (gpointer key, gpointer data, gpointer user_data)
- /**
-  * nm_connection_need_secrets:
-  * @connection: the #NMConnection
-- * @hints: the address of a pointer to a #GPtrArray, initialized to NULL, which
-- * on return points to an allocated #GPtrArray containing the property names of
-- * secrets of the #NMSetting which may be required; the caller owns the array
-- * and must free the each array element with g_free(), as well as the array
-- * itself with g_ptr_array_free()
-+ * @hints: (out callee-allocates) (element-type utf8) (allow-none) (transfer full):
-+ *   the address of a pointer to a #GPtrArray, initialized to NULL, which on
-+ *   return points to an allocated #GPtrArray containing the property names of
-+ *   secrets of the #NMSetting which may be required; the caller owns the array
-+ *   and must free the each array element with g_free(), as well as the array
-+ *   itself with g_ptr_array_free()
-  *
-  * Returns the name of the first setting object in the connection which would
-  * need secrets to make a successful connection.  The returned hints are only
-@@ -741,7 +742,7 @@ add_setting_to_list (gpointer key, gpointer data, gpointer user_data)
-  * secrets are needed.
-  *
-  * Returns: the setting name of the #NMSetting object which has invalid or
-- * missing secrets
-+ *   missing secrets
-  **/
- const char *
- nm_connection_need_secrets (NMConnection *connection,
-@@ -821,7 +822,7 @@ nm_connection_clear_secrets (NMConnection *connection)
-  * are #GHashTables mapping string:GValue, each of which represents the
-  * properties of the #NMSetting object.
-  *
-- * Returns: (transfer full) (element-type utf8 GLib.HashTable): a new 
-+ * Returns: (transfer full) (element-type utf8 GHashTable<utf8,GValue>): a new
-  * #GHashTable describing the connection, its settings, and each setting's
-  * properties.  The caller owns the hash table and must unref the hash table
-  * with g_hash_table_unref() when it is no longer needed.
-diff --git a/libnm-util/nm-setting-vpn.h b/libnm-util/nm-setting-vpn.h
-index bb20356..6ff1928 100644
---- a/libnm-util/nm-setting-vpn.h
-+++ b/libnm-util/nm-setting-vpn.h
-@@ -72,8 +72,6 @@ typedef struct {
- } NMSettingVPNClass;
- 
- typedef void (*NMVPNIterFunc) (const char *key, const char *value, gpointer user_data);
--/* For backward compatibility */
--typedef NMVPNIterFunc VPNIterFunc;
- 
- GType nm_setting_vpn_get_type (void);
- 
--- 
-1.7.4
\ No newline at end of file

diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild
index f0f5095..d4bbdd6 100644
--- a/net-misc/networkmanager/networkmanager-9999.ebuild
+++ b/net-misc/networkmanager/networkmanager-9999.ebuild
@@ -133,9 +133,6 @@ src_prepare() {
 	# FIXME: does not apply
 	#epatch "${FILESDIR}/${PN}-0.8.2-shared-connection.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=637032
-	epatch "${FILESDIR}/${PN}-introspection-fixes.patch"
-
 	gnome2_src_prepare
 }