# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1283498921 0
# Node ID 1aa5e2934ef0cfbfc6d52e9513302d76bd1eb480
# Parent  3e7441e05be354e2ab2be9f8d1d22697795eb249# Parent  b8e38df2cb7792f08ff23e549f99ae7cd11811c0
merge of 'c7f2cce48dfe465889b7803de44156e7e89e41e0'
     and 'fafe54ad99f452f7b5d446e154440057c8863bd6'

diff -r b8e38df2cb77 -r 1aa5e2934ef0 ChangeLog
--- a/ChangeLog	Thu Sep 02 17:51:51 2010 +0000
+++ b/ChangeLog	Fri Sep 03 07:28:41 2010 +0000
@@ -15,8 +15,8 @@
 	* Remap the "Set User Mood" shortcut to Control-D, which does not
 	  conflict with the previous shortcut for Get Buddy Info on the
 	  selected buddy.
-	* Add a plugin action menu (unter Tools) for the Voice and Video Settings
-	  plugin.
+	* Add a plugin action menu (under Tools) for the Voice and Video
+	  Settings plugin.
 
 	Finch:
 	* Add support for drop-down account options (like the SILC cipher
diff -r b8e38df2cb77 -r 1aa5e2934ef0 libpurple/network.c
--- a/libpurple/network.c	Thu Sep 02 17:51:51 2010 +0000
+++ b/libpurple/network.c	Fri Sep 03 07:28:41 2010 +0000
@@ -1077,12 +1077,10 @@
 
 	if (protocol) {
 		purple_network_upnp_mapping_remove(&port, protocol, NULL);
-		g_hash_table_remove(upnp_port_mappings, protocol);
 	} else {
 		protocol = g_hash_table_lookup(nat_pmp_port_mappings, &port);
 		if (protocol) {
 			purple_network_nat_pmp_mapping_remove(&port, protocol, NULL);
-			g_hash_table_remove(nat_pmp_port_mappings, protocol);
 		}
 	}
 }
diff -r b8e38df2cb77 -r 1aa5e2934ef0 pidgin/plugins/vvconfig.c
--- a/pidgin/plugins/vvconfig.c	Thu Sep 02 17:51:51 2010 +0000
+++ b/pidgin/plugins/vvconfig.c	Fri Sep 03 07:28:41 2010 +0000
@@ -543,8 +543,8 @@
 	}
 	gtk_window_present(GTK_WINDOW(window));
 }
-		
-		
+
+
 static GList *
 actions(PurplePlugin *plugin, gpointer context)
 {
@@ -581,32 +581,32 @@
 
 static PurplePluginInfo info =
 {
-	PURPLE_PLUGIN_MAGIC,			/**< magic		*/
-	PURPLE_MAJOR_VERSION,			/**< major version	*/
-	PURPLE_MINOR_VERSION,			/**< minor version	*/
-	PURPLE_PLUGIN_STANDARD,			/**< type		*/
-	PIDGIN_PLUGIN_TYPE,			/**< ui_requirement	*/
-	0,					/**< flags		*/
-	NULL,					/**< dependencies	*/
-	PURPLE_PRIORITY_DEFAULT,		/**< priority		*/
+	PURPLE_PLUGIN_MAGIC,                         /**< magic          */
+	PURPLE_MAJOR_VERSION,                        /**< major version  */
+	PURPLE_MINOR_VERSION,                        /**< minor version  */
+	PURPLE_PLUGIN_STANDARD,                      /**< type           */
+	PIDGIN_PLUGIN_TYPE,                          /**< ui_requirement */
+	0,                                           /**< flags          */
+	NULL,                                        /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                     /**< priority       */
 
-	"gtk-maiku-vvconfig",			/**< id			*/
-	N_("Voice/Video Settings"),		/**< name		*/
-	DISPLAY_VERSION,			/**< version		*/
-	N_("Configure your microphone and webcam."), /**< summary	*/
+	"gtk-maiku-vvconfig",                        /**< id             */
+	N_("Voice/Video Settings"),                  /**< name           */
+	DISPLAY_VERSION,                             /**< version        */
+	N_("Configure your microphone and webcam."), /**< summary        */
 	N_("Configure microphone and webcam "
-	   "settings for voice/video calls."),	/**< description	*/
-	"Mike Ruprecht <cmaiku@gmail.com>",	/**< author		*/
-	PURPLE_WEBSITE,				/**< homepage		*/
+	   "settings for voice/video calls."),       /**< description    */
+	"Mike Ruprecht <cmaiku@gmail.com>",          /**< author         */
+	PURPLE_WEBSITE,                              /**< homepage       */
 
-	plugin_load,				/**< load		*/
-	plugin_unload,				/**< unload		*/
-	NULL,					/**< destroy		*/
+	plugin_load,                                 /**< load           */
+	plugin_unload,                               /**< unload         */
+	NULL,                                        /**< destroy        */
 
-	&ui_info,				/**< ui_info		*/
-	NULL,					/**< extra_info		*/
-	NULL,					/**< prefs_info		*/
-	actions,					/**< actions		*/
+	&ui_info,                                    /**< ui_info        */
+	NULL,                                        /**< extra_info     */
+	NULL,                                        /**< prefs_info     */
+	actions,                                     /**< actions        */
 
 	/* padding */
 	NULL,