Mercurial > pidgin.yaz

changeset 21349:14e8ad7bc9a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '88ea7f54513c734e65a7fc3f4318f393093f6fb6' and '9825d58ee82a2b9dc647a626dbb0221665f00a33'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:01:09 +0000
parents b2aab3aa316b (current diff) 8d8f06962b65 (diff)
children 0cb8d5304f4f
files libpurple/request.h pidgin/gtkrequest.c
diffstat 22 files changed, 37 insertions(+), 497 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Nov 16 23:00:55 2007 +0000
+++ b/ChangeLog	Fri Nov 16 23:01:09 2007 +0000
@@ -12,8 +12,6 @@
 	  remove the plugin from the list of saved plugins so it won't load
 	  at the next startup.  Previously, we were ignoring this case, which
 	  could lead to crashes.
-	* Mark dialog windows as transient for appropriate parent windows to
-	  help window managers do the right thing  (Gabriel Schulhof)
 
 	Finch:
 	* If a plugin says it can't be unloaded, we now display an error and
--- a/ChangeLog.API	Fri Nov 16 23:00:55 2007 +0000
+++ b/ChangeLog.API	Fri Nov 16 23:01:09 2007 +0000
@@ -15,26 +15,6 @@
 		  from being saved in the saved plugins list, so it'll won't
 		  be loaded at the next startup.
 
-		* pidgin_dialogs_about_with_parent()
-		* pidgin_log_show_contact_with_parent()
-		* pidgin_log_show_with_parent()
-		* pidgin_plugin_dialog_show_with_parent()
-		* pidgin_pounce_editor_show_with_parent()
-		* pidgin_pounces_manager_show_with_parent()
-		* pidgin_syslog_show_with_parent()
-
-		* purple_request_accept_cancel_with_hint()
-		* purple_request_action_varg_with_hint()
-		* purple_request_action_with_hint()
-		* purple_request_choice_varg_with_hint()
-		* purple_request_choice_with_hint()
-		* purple_request_fields_with_hint()
-		* purple_request_file_with_hint()
-		* purple_request_folder_with_hint()
-		* purple_request_input_with_hint()
-		* purple_request_ok_cancel_with_hint()
-		* purple_request_yes_no_with_hint()
-
 		Changed:
 		* purple_plugin_unload() now honors the return value of a
 		  plugin's unload function and can actually return FALSE now.
@@ -42,27 +22,6 @@
 		  when a dependent plugin fails to unload.  The UI should do
 		  something appropriate.
 
-		Deprecated:
-		* pidgin_dialogs_about()
-		* pidgin_log_show_contact()
-		* pidgin_log_show()
-		* pidgin_plugin_dialog_show()
-		* pidgin_pounce_editor_show()
-		* pidgin_pounces_manager_show()
-		* pidgin_syslog_show()
-
-		* purple_request_accept_cancel()
-		* purple_request_action_varg()
-		* purple_request_action()
-		* purple_request_choice_varg()
-		* purple_request_choice()
-		* purple_request_fields()
-		* purple_request_file()
-		* purple_request_folder()
-		* purple_request_input()
-		* purple_request_ok_cancel()
-		* purple_request_yes_no()
-
 version 2.2.2 (??/??/????):
 	libpurple:
 		Changed:
--- a/libpurple/protocols/qq/sys_msg.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/libpurple/protocols/qq/sys_msg.c	Fri Nov 16 23:01:09 2007 +0000
@@ -83,7 +83,7 @@
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 
 	nombre = uid_to_purple_name(uid);
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, _("Do you want to approve the request?"), "", 2,
 		 purple_connection_get_account(gc), nombre, NULL,
 		 PURPLE_REQUEST_HINT_CONV, g, 2,
@@ -106,11 +106,11 @@
 
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 	nombre = uid_to_purple_name(uid);
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, _("Do you want to add this buddy?"), "", 2,
 		 purple_connection_get_account(gc), nombre, NULL,
 		 PURPLE_REQUEST_HINT_BUDDY, g, 2,
-		 _("Cancel"), NULL,
+	     _("Cancel"), NULL,
 		 _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid));
 	g_free(nombre);
 }
@@ -239,7 +239,7 @@
 	reason = g_strdup_printf(_("Message: %s"), msg_utf8);
 	_qq_sys_msg_log_write(gc, message, from);
 
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, message, reason, 2,
 		purple_connection_get_account(gc), name, NULL,
 		 PURPLE_REQUEST_HINT_BUDDY, g, 3,
--- a/libpurple/protocols/silc/chat.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/libpurple/protocols/silc/chat.c	Fri Nov 16 23:01:09 2007 +0000
@@ -301,7 +301,7 @@
 	f = purple_request_fields_get_field(fields, "list");
 	if (!purple_request_field_list_get_selected(f)) {
 		/* Add new public key */
-		purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE,
+		purple_request_file)with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE,
 				    G_CALLBACK(silcpurple_chat_chpk_add),
 				    G_CALLBACK(silcpurple_chat_chpk_cancel),
 				    purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc);
--- a/libpurple/request.h	Fri Nov 16 23:00:55 2007 +0000
+++ b/libpurple/request.h	Fri Nov 16 23:01:09 2007 +0000
@@ -1325,8 +1325,6 @@
  * @param user_data     The data to pass to the callback.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
  */
 void *purple_request_input_with_hint(void *handle, const char *title,
 						 const char *primary, const char *secondary,
@@ -1337,44 +1335,7 @@
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
 						 const char *ui_hint, void *user_data);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * Prompts the user for text input.
- *
- * @param handle        The plugin or connection handle.  For some
- *                      things this is EXTREMELY important.  The
- *                      handle is used to programmatically close
- *                      the request dialog when it is no longer
- *                      needed.  For PRPLs this is often a pointer
- *                      to the PurpleConnection instance.  For plugins
- *                      this should be a similar, unique memory
- *                      location.  This value is important because
- *                      it allows a request to be closed, say, when
- *                      you sign offline.  If the request is NOT
- *                      closed it is VERY likely to cause a crash
- *                      whenever the callback handler functions are
- *                      triggered.
- * @param title         The title of the message.
- * @param primary       The main point of the message.
- * @param secondary     The secondary information.
- * @param default_value The default value.
- * @param multiline     TRUE if the inputted text can span multiple lines.
- * @param masked        TRUE if the inputted text should be masked in some way.
- * @param hint          Optionally suggest how the input box should appear.
- *                      Use "html," for example, to allow the user to enter
- *                      HTML.
- * @param ok_text       The text for the @c OK button.
- * @param ok_cb         The callback for the @c OK button.
- * @param cancel_text   The text for the @c Cancel button.
- * @param cancel_cb     The callback for the @c Cancel button.
- * @param account		The PurpleAccount associated with this request, or NULL if none is
- * @param who			The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
- * @param user_data     The data to pass to the callback.
- *
- * @return A UI-specific handle.
- *
  * @deprecated Please use purple_request_input_with_hint() instead.
  */
 void *purple_request_input(void *handle, const char *title,
@@ -1385,7 +1346,6 @@
 						 const char *cancel_text, GCallback cancel_cb,
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
 						 void *user_data);
-#endif
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1410,8 +1370,6 @@
  *                      terminated with a NULL parameter.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
  */
 void *purple_request_choice_with_hint(void *handle, const char *title,
 						  const char *primary, const char *secondary,
@@ -1421,31 +1379,7 @@
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  const char *ui_hint, void *user_data, ...) G_GNUC_NULL_TERMINATED;
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * Prompts the user for multiple-choice input.
- *
- * @param handle        The plugin or connection handle.  For some
- *                      things this is EXTREMELY important.  See
- *                      the comments on purple_request_input.
- * @param title         The title of the message.
- * @param primary       The main point of the message.
- * @param secondary     The secondary information.
- * @param default_value The default value.
- * @param ok_text       The text for the @c OK button.
- * @param ok_cb         The callback for the @c OK button.
- * @param cancel_text   The text for the @c Cancel button.
- * @param cancel_cb     The callback for the @c Cancel button.
- * @param account		The PurpleAccount associated with this request, or NULL if none is
- * @param who			The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
- * @param user_data     The data to pass to the callback.
- * @param ...           The choices.  This argument list should be
- *                      terminated with a NULL parameter.
- *
- * @return A UI-specific handle.
- *
  * @deprecated Please use purple_request_choice_with_hint() instead.
  */
 void *purple_request_choice(void *handle, const char *title,
@@ -1455,7 +1389,6 @@
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, ...) G_GNUC_NULL_TERMINATED;
-#endif
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1480,8 +1413,6 @@
  *                      terminated with a @c NULL parameter.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
  */
 void *purple_request_choice_varg_with_hint(void *handle, const char *title,
 							   const char *primary, const char *secondary,
@@ -1491,31 +1422,7 @@
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   const char *ui_hint, void *user_data, va_list choices);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * Prompts the user for multiple-choice input.
- *
- * @param handle        The plugin or connection handle.  For some
- *                      things this is EXTREMELY important.  See
- *                      the comments on purple_request_input.
- * @param title         The title of the message.
- * @param primary       The main point of the message.
- * @param secondary     The secondary information.
- * @param default_value The default value.
- * @param ok_text       The text for the @c OK button.
- * @param ok_cb         The callback for the @c OK button.
- * @param cancel_text   The text for the @c Cancel button.
- * @param cancel_cb     The callback for the @c Cancel button.
- * @param account		The PurpleAccount associated with this request, or NULL if none is
- * @param who			The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
- * @param user_data     The data to pass to the callback.
- * @param choices       The choices.  This argument list should be
- *                      terminated with a @c NULL parameter.
- *
- * @return A UI-specific handle.
- *
  * @deprecated Please use purple_request_choice_varg_with_hint() instead.
  */
 void *purple_request_choice_varg(void *handle, const char *title,
@@ -1525,7 +1432,6 @@
 							   const char *cancel_text, GCallback cancel_cb,
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   void *user_data, va_list choices);
-#endif
 
 /**
  * Prompts the user for an action.
@@ -1554,8 +1460,6 @@
  *                       function to use when the button is clicked.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
  */
 void *purple_request_action_with_hint(void *handle, const char *title,
 						  const char *primary, const char *secondary,
@@ -1563,35 +1467,7 @@
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  const char *ui_hint, void *user_data, size_t action_count, ...);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * Prompts the user for an action.
- *
- * This is often represented as a dialog with a button for each action.
- *
- * @param handle         The plugin or connection handle.  For some
- *                       things this is EXTREMELY important.  See
- *                       the comments on purple_request_input.
- * @param title          The title of the message.
- * @param primary        The main point of the message.
- * @param secondary      The secondary information.
- * @param default_action The default value.
- * @param account		 The PurpleAccount associated with this request, or NULL if none is
- * @param who			 The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			 The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint        UI hint
- * @param user_data      The data to pass to the callback.
- * @param action_count   The number of actions.
- * @param ...            A list of actions.  These are pairs of
- *                       arguments.  The first of each pair is the
- *                       string that appears on the button.  It should
- *                       have an underscore before the letter you want
- *                       to use as the accelerator key for the button.
- *                       The second of each pair is the callback
- *                       function to use when the button is clicked.
- *
- * @return A UI-specific handle.
- *
  * @deprecated Please use purple_request_action_with_hint() instead.
  */
 void *purple_request_action(void *handle, const char *title,
@@ -1599,7 +1475,6 @@
 						  int default_action,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, size_t action_count, ...);
-#endif
 
 /**
  * Prompts the user for an action.
@@ -1622,8 +1497,6 @@
  * @param actions        A list of actions and callbacks.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
  */
 void *purple_request_action_varg_with_hint(void *handle, const char *title,
 							   const char *primary, const char *secondary,
@@ -1632,29 +1505,7 @@
 							   const char *ui_hint, void *user_data, size_t action_count,
 							   va_list actions);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * Prompts the user for an action.
- *
- * This is often represented as a dialog with a button for each action.
- *
- * @param handle         The plugin or connection handle.  For some
- *                       things this is EXTREMELY important.  See
- *                       the comments on purple_request_input.
- * @param title          The title of the message.
- * @param primary        The main point of the message.
- * @param secondary      The secondary information.
- * @param default_action The default value.
- * @param account		 The PurpleAccount associated with this request, or NULL if none is
- * @param who			 The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			 The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint        UI hint
- * @param user_data      The data to pass to the callback.
- * @param action_count   The number of actions.
- * @param actions        A list of actions and callbacks.
- *
- * @return A UI-specific handle.
- *
  * @deprecated Please use purple_request_action_varg_with_hint() instead.
  */
 void *purple_request_action_varg(void *handle, const char *title,
@@ -1663,7 +1514,6 @@
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   void *user_data, size_t action_count,
 							   va_list actions);
-#endif
 
 /**
  * Displays groups of fields for the user to fill in.
@@ -1686,8 +1536,6 @@
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
  */
 void *purple_request_fields_with_hint(void *handle, const char *title,
 						  const char *primary, const char *secondary,
@@ -1697,29 +1545,7 @@
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  const char *ui_hint, void *user_data);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * Displays groups of fields for the user to fill in.
- *
- * @param handle      The plugin or connection handle.  For some
- *                    things this is EXTREMELY important.  See
- *                    the comments on purple_request_input.
- * @param title       The title of the message.
- * @param primary     The main point of the message.
- * @param secondary   The secondary information.
- * @param fields      The list of fields.
- * @param ok_text     The text for the @c OK button.
- * @param ok_cb       The callback for the @c OK button.
- * @param cancel_text The text for the @c Cancel button.
- * @param cancel_cb   The callback for the @c Cancel button.
- * @param account	  The PurpleAccount associated with this request, or NULL if none is
- * @param who		  The username of the buddy associated with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
- * @param user_data   The data to pass to the callback.
- *
- * @return A UI-specific handle.
- *
  * @deprecated Please use purple_request_fields_with_hint() instead.
  */
 void *purple_request_fields(void *handle, const char *title,
@@ -1729,7 +1555,6 @@
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data);
-#endif
 
 /**
  * Closes a request.
@@ -1748,8 +1573,6 @@
 
 /**
  * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
- *
- * @since 2.3.0
  */
 #define purple_request_yes_no_with_hint(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
@@ -1758,10 +1581,7 @@
 						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_Yes"), (yes_cb), _("_No"), (no_cb))
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
- *
  * @deprecated Please use purple_request_yes_no_with_hint instead.
  */
 #define purple_request_yes_no(handle, title, primary, secondary, \
@@ -1770,12 +1590,9 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_Yes"), (yes_cb), _("_No"), (no_cb))
-#endif
 
 /**
  * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
- *
- * @since 2.3.0
  */
 #define purple_request_ok_cancel_with_hint(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
@@ -1784,10 +1601,7 @@
 						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
- *
  * @deprecated Please use purple_request_ok_cancel_with_hint instead.
  */
 #define purple_request_ok_cancel(handle, title, primary, secondary, \
@@ -1796,12 +1610,9 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
-#endif
 
 /**
  * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
- *
- * @since 2.3.0
  */
 #define purple_request_accept_cancel_with_hint(handle, title, primary, secondary, \
 								   default_action, account, who, conv, \
@@ -1810,10 +1621,7 @@
 						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
- *
  * @deprecated Please use purple_request_accept_cancel_with_hint instead.
  */
 #define purple_request_accept_cancel(handle, title, primary, secondary, \
@@ -1822,7 +1630,6 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
-#endif
 
 /**
  * Displays a file selector request dialog.  Returns the selected filename to
@@ -1844,8 +1651,6 @@
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
  */
 void *purple_request_file_with_hint(void *handle, const char *title, const char *filename,
 						gboolean savedialog,
@@ -1853,28 +1658,7 @@
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						const char *ui_hint, void *user_data);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * Displays a file selector request dialog.  Returns the selected filename to
- * the callback.  Can be used for either opening a file or saving a file.
- *
- * @param handle      The plugin or connection handle.  For some
- *                    things this is EXTREMELY important.  See
- *                    the comments on purple_request_input.
- * @param title       The title for the dialog (may be @c NULL)
- * @param filename    The default filename (may be @c NULL)
- * @param savedialog  True if this dialog is being used to save a file.
- *                    False if it is being used to open a file.
- * @param ok_cb       The callback for the @c OK button.
- * @param cancel_cb   The callback for the @c Cancel button.
- * @param account	  The PurpleAccount associated with this request, or NULL if none is
- * @param who		  The username of the buddy assocaited with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
- * @param user_data   The data to pass to the callback.
- *
- * @return A UI-specific handle.
- *
  * @deprecated Please use purple_request_file_with_hint() instead.
  */
 void *purple_request_file(void *handle, const char *title, const char *filename,
@@ -1882,7 +1666,6 @@
 						GCallback ok_cb, GCallback cancel_cb,
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data);
-#endif
 
 /**
  * Displays a folder select dialog. Returns the selected filename to
@@ -1902,41 +1685,19 @@
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
  */
 void *purple_request_folder_with_hint(void *handle, const char *title, const char *dirname,
 						GCallback ok_cb, GCallback cancel_cb,
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						const char *ui_hint, void *user_data);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
- * Displays a folder select dialog. Returns the selected filename to
- * the callback.
- *
- * @param handle      The plugin or connection handle.  For some
- *                    things this is EXTREMELY important.  See
- *                    the comments on purple_request_input.
- * @param title       The title for the dialog (may be @c NULL)
- * @param dirname     The default directory name (may be @c NULL)
- * @param ok_cb       The callback for the @c OK button.
- * @param cancel_cb   The callback for the @c Cancel button.
- * @param account	  The PurpleAccount associated with this request, or NULL if none is
- * @param who		  The username of the buddy assocaited with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
- * @param user_data   The data to pass to the callback.
- *
- * @return A UI-specific handle.
- *
  * @deprecated Please use purple_request_folder_with_hint() instead.
  */
 void *purple_request_folder(void *handle, const char *title, const char *dirname,
 						GCallback ok_cb, GCallback cancel_cb,
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data);
-#endif
 
 /*@}*/
 
--- a/pidgin/gtkblist.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Nov 16 23:01:09 2007 +0000
@@ -617,7 +617,7 @@
 
 static void gtk_blist_menu_bp_cb(GtkWidget *w, PurpleBuddy *b)
 {
-	pidgin_pounce_editor_show_with_parent(GTK_WINDOW(gtkblist->window), b->account, b->name, NULL);
+	pidgin_pounce_editor_show(b->account, b->name, NULL);
 }
 
 static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBlistNode *node)
@@ -643,7 +643,7 @@
 			name = prpl_info->get_chat_name(c->components);
 		}
 	} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
-		pidgin_log_show_contact_with_parent(GTK_WINDOW(gtkblist->window), (PurpleContact *)node);
+		pidgin_log_show_contact((PurpleContact *)node);
 		pidgin_clear_cursor(gtkblist->window);
 		return;
 	} else {
@@ -655,7 +655,7 @@
 	}
 
 	if (name && account) {
-		pidgin_log_show_with_parent(GTK_WINDOW(gtkblist->window), type, name, account);
+		pidgin_log_show(type, name, account);
 		g_free(name);
 
 		pidgin_clear_cursor(gtkblist->window);
@@ -682,6 +682,11 @@
 	pidgin_blist_update(purple_get_blist(), node);
 }
 
+static void gtk_blist_show_systemlog_cb()
+{
+	pidgin_syslog_show();
+}
+
 static void gtk_blist_show_onlinehelp_cb()
 {
 	purple_notify_uri(NULL, PURPLE_WEBSITE "documentation");
@@ -3052,11 +3057,6 @@
 			!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"));
 }
 
-static void
-pidgin_blist_show_with_parent(gpointer data1, void (*callback)(GtkWindow *parent), gpointer data3)
-{
-	callback(GTK_WINDOW(gtkblist->window));
-}
 
 /***************************************************
  *            Crap                                 *
@@ -3090,15 +3090,15 @@
 
 	/* Tools */
 	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL },
-	{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_blist_show_with_parent, (int)pidgin_pounces_manager_show_with_parent, "<Item>", NULL },
+	{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "<Item>", NULL },
 	{ N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "<Item>", NULL },
-	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_blist_show_with_parent, (int)pidgin_plugin_dialog_show_with_parent, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
+	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL },
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
-	{ N_("/Tools/System _Log"), NULL, pidgin_blist_show_with_parent, (int)pidgin_syslog_show_with_parent, "<Item>", NULL },
+	{ N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<Item>", NULL },
 	{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
 	/* Help */
@@ -3106,9 +3106,9 @@
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
 #if GTK_CHECK_VERSION(2,6,0)
-	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about_with_parent, "<StockItem>", GTK_STOCK_ABOUT },
+	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<StockItem>", GTK_STOCK_ABOUT },
 #else
-	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about_with_parent, "<Item>", NULL },
+	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<Item>", NULL },
 #endif
 };
 
--- a/pidgin/gtkdebug.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkdebug.c	Fri Nov 16 23:01:09 2007 +0000
@@ -36,7 +36,6 @@
 #include "gtkimhtml.h"
 #include "gtkutils.h"
 #include "pidginstock.h"
-#include "gtkblist.h"
 
 #ifdef HAVE_REGEX_H
 # include <regex.h>
@@ -674,7 +673,6 @@
 static DebugWindow *
 debug_window_new(void)
 {
-	PidginBuddyList *blist;
 	DebugWindow *win;
 	GtkWidget *vbox;
 	GtkWidget *toolbar;
@@ -689,9 +687,6 @@
 	height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/height");
 
 	PIDGIN_DIALOG(win->window);
-	if ((blist = pidgin_blist_get_default_gtk_blist()) != NULL)
-		if (blist->window)
-			gtk_window_set_transient_for(GTK_WINDOW(win->window), GTK_WINDOW(blist->window));
 	purple_debug_info("gtkdebug", "Setting dimensions to %d, %d\n",
 					width, height);
 
--- a/pidgin/gtkdialogs.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkdialogs.c	Fri Nov 16 23:01:09 2007 +0000
@@ -334,13 +334,6 @@
 
 void pidgin_dialogs_about()
 {
-	PidginBuddyList *blist = pidgin_blist_get_default_gtk_blist();
-
-	pidgin_dialogs_about_with_parent(blist ? GTK_WINDOW(blist->window) : NULL);
-}
-
-void pidgin_dialogs_about_with_parent(GtkWindow *parent)
-{
 	GtkWidget *hbox;
 	GtkWidget *vbox;
 	GtkWidget *logo;
@@ -356,15 +349,11 @@
 	GdkPixbuf *pixbuf;
 
 	if (about != NULL) {
-		if (parent)
-			gtk_window_set_transient_for(GTK_WINDOW(about), parent);
 		gtk_window_present(GTK_WINDOW(about));
 		return;
 	}
 
 	PIDGIN_DIALOG(about);
-	if (parent)
-		gtk_window_set_transient_for(GTK_WINDOW(about), parent);
 	tmp = g_strdup_printf(_("About %s"), PIDGIN_NAME);
 	gtk_window_set_title(GTK_WINDOW(about), tmp);
 	g_free(tmp);
--- a/pidgin/gtkdialogs.h	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkdialogs.h	Fri Nov 16 23:01:09 2007 +0000
@@ -31,33 +31,18 @@
 #include "conversation.h"
 
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
-
 void pidgin_dialogs_destroy_all(void);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * @deprecated Use pidgin_dialogs_about_with_parent() instead.
- */
 void pidgin_dialogs_about(void);
-#endif
-
-/**
- * @since 2.3.0
- */
-void pidgin_dialogs_about_with_parent(GtkWindow *parent);
-
 void pidgin_dialogs_im(void);
 void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
 void pidgin_dialogs_info(void);
 void pidgin_dialogs_log(void);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * @deprecated This function is no longer used and will be removed in
  *             Pidgin 3.0.0 unless there is sufficient demand to keep it.
  */
 void pidgin_dialogs_alias_contact(PurpleContact *);
-#endif
 
 void pidgin_dialogs_alias_buddy(PurpleBuddy *);
 void pidgin_dialogs_alias_chat(PurpleChat *);
--- a/pidgin/gtkimhtmltoolbar.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Fri Nov 16 23:01:09 2007 +0000
@@ -184,8 +184,6 @@
 			g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize",
 							 G_CALLBACK(realize_toolbar_font), toolbar);
 		}
-		gtk_window_set_transient_for(GTK_WINDOW(toolbar->font_dialog),
-		    GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar))));
 		gtk_window_present(GTK_WINDOW(toolbar->font_dialog));
 	} else {
 		cancel_toolbar_font(font, toolbar);
@@ -711,8 +709,6 @@
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
 	gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog");
 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
-	gtk_window_set_transient_for(GTK_WINDOW(dialog),
-	    GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar))));
 
 	if (unique_smileys != NULL) {
 		struct smiley_button_list *ls, *it, *it_tmp;
--- a/pidgin/gtklog.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtklog.c	Fri Nov 16 23:01:09 2007 +0000
@@ -523,7 +523,7 @@
 	}
 }
 
-static PidginLogViewer *display_log_viewer(GtkWindow *parent, struct log_viewer_hash_t *ht, GList *logs,
+static PidginLogViewer *display_log_viewer(struct log_viewer_hash_t *ht, GList *logs,
 						const char *title, GtkWidget *icon, int log_size)
 {
 	PidginLogViewer *lv;
@@ -569,7 +569,7 @@
 		g_hash_table_insert(log_viewers, ht, lv);
 
 	/* Window ***********/
-	lv->window = gtk_dialog_new_with_buttons(title, parent, 0,
+	lv->window = gtk_dialog_new_with_buttons(title, NULL, 0,
 					     GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
 #ifdef _WIN32
 	/* Steal the "HELP" response and use it to trigger browsing to the logs folder */
@@ -676,10 +676,6 @@
 }
 
 void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account) {
-	pidgin_log_show_with_parent(NULL, type, screenname, account);
-}
-
-void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account) {
 	struct log_viewer_hash_t *ht;
 	PidginLogViewer *lv = NULL;
 	const char *name = screenname;
@@ -724,7 +720,7 @@
 
 	prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 
-	display_log_viewer(parent, ht, purple_log_get_logs(type, screenname, account),
+	display_log_viewer(ht, purple_log_get_logs(type, screenname, account),
 			title, gtk_image_new_from_pixbuf(prpl_icon),
 			purple_log_get_total_size(type, screenname, account));
 
@@ -734,10 +730,6 @@
 }
 
 void pidgin_log_show_contact(PurpleContact *contact) {
-	pidgin_log_show_contact_with_parent(NULL, contact);
-}
-
-void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact) {
 	struct log_viewer_hash_t *ht = g_new0(struct log_viewer_hash_t, 1);
 	PurpleBlistNode *child;
 	PidginLogViewer *lv = NULL;
@@ -791,16 +783,11 @@
 	}
 
 	title = g_strdup_printf(_("Conversations with %s"), name);
-	display_log_viewer(parent, ht, logs, title, image, total_log_size);
+	display_log_viewer(ht, logs, title, image, total_log_size);
 	g_free(title);
 }
 
-void pidgin_syslog_show(void)
-{
-	pidgin_syslog_show_with_parent(NULL);
-}
-
-void pidgin_syslog_show_with_parent(GtkWindow *parent)
+void pidgin_syslog_show()
 {
 	GList *accounts = NULL;
 	GList *logs = NULL;
@@ -820,7 +807,7 @@
 	}
 	logs = g_list_sort(logs, purple_log_compare);
 
-	syslog_viewer = display_log_viewer(parent, NULL, logs, _("System Log"), NULL, 0);
+	syslog_viewer = display_log_viewer(NULL, logs, _("System Log"), NULL, 0);
 }
 
 /****************************************************************************
--- a/pidgin/gtklog.h	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtklog.h	Fri Nov 16 23:01:09 2007 +0000
@@ -52,41 +52,11 @@
 };
 
 
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * @deprecated Use pidgin_log_show_with_parent() instead.
- */
+
 void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account);
-#endif
-
-/**
- * @since 2.3.0
- */
-void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * @deprecated pidgin_log_show_contact_with_parent() instead.
- */
 void pidgin_log_show_contact(PurpleContact *contact);
-#endif
 
-/**
- * @since 2.3.0
- */
-void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * @deprecated Use pidgin_syslog_show_with_parent() instead.
- */
 void pidgin_syslog_show(void);
-#endif
-
-/**
- * @since 2.3.0
- */
-void pidgin_syslog_show_with_parent(GtkWindow *parent);
 
 /**************************************************************************/
 /** @name GTK+ Log Subsystem                                              */
--- a/pidgin/gtkplugin.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkplugin.c	Fri Nov 16 23:01:09 2007 +0000
@@ -533,11 +533,6 @@
 
 void pidgin_plugin_dialog_show()
 {
-	pidgin_plugin_dialog_show_with_parent(NULL);
-}
-
-void pidgin_plugin_dialog_show_with_parent(GtkWindow *parent)
-{
 	GtkWidget *sw;
 	GtkWidget *event_view;
 	GtkListStore *ls;
@@ -546,8 +541,6 @@
 	GtkTreeSelection *sel;
 
 	if (plugin_dialog != NULL) {
-		if (parent)
-			gtk_window_set_transient_for(GTK_WINDOW(plugin_dialog), parent);
 		gtk_window_present(GTK_WINDOW(plugin_dialog));
 		return;
 	}
@@ -556,8 +549,6 @@
 						    NULL,
 						    GTK_DIALOG_NO_SEPARATOR,
 						    NULL);
-	if (parent)
-		gtk_window_set_transient_for(GTK_WINDOW(plugin_dialog), parent);
 	pref_button = gtk_dialog_add_button(GTK_DIALOG(plugin_dialog),
 						_("Configure Pl_ugin"), PIDGIN_RESPONSE_CONFIGURE);
 	gtk_dialog_add_button(GTK_DIALOG(plugin_dialog),
--- a/pidgin/gtkplugin.h	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkplugin.h	Fri Nov 16 23:01:09 2007 +0000
@@ -72,20 +72,9 @@
  */
 void pidgin_plugins_save(void);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Shows the Plugins dialog
- *
- * @deprecated Use pidgin_plugin_dialog_show_with_parent() instead.
  */
 void pidgin_plugin_dialog_show(void);
-#endif
-
-/**
- * Shows the Plugins dialog, transient to a parent window
- *
- * @since 2.3.0
- */
-void pidgin_plugin_dialog_show_with_parent(GtkWindow *parent);
 
 #endif /* _PIDGINPLUGIN_H_ */
--- a/pidgin/gtkpounce.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkpounce.c	Fri Nov 16 23:01:09 2007 +0000
@@ -472,13 +472,6 @@
 pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
 							PurplePounce *cur_pounce)
 {
-	pidgin_pounce_editor_show_with_parent(NULL, account, name, cur_pounce);
-}
-
-void
-pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name,
-							PurplePounce *cur_pounce)
-{
 	PidginPounceDialog *dialog;
 	GtkWidget *window;
 	GtkWidget *label;
@@ -1057,7 +1050,7 @@
 static void
 pounces_manager_add_cb(GtkButton *button, gpointer user_data)
 {
-	pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, NULL);
+	pidgin_pounce_editor_show(NULL, NULL, NULL);
 }
 
 static void
@@ -1067,7 +1060,7 @@
 	PurplePounce *pounce;
 
 	gtk_tree_model_get(model, iter, POUNCES_MANAGER_COLUMN_POUNCE, &pounce, -1);
-	pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, pounce);
+	pidgin_pounce_editor_show(NULL, NULL, pounce);
 }
 
 static void
@@ -1167,7 +1160,7 @@
 	if ((pounce != NULL) && (event->button == 1) &&
 		(event->type == GDK_2BUTTON_PRESS))
 	{
-		pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, pounce);
+		pidgin_pounce_editor_show(NULL, NULL, pounce);
 		return TRUE;
 	}
 
@@ -1318,12 +1311,6 @@
 void
 pidgin_pounces_manager_show(void)
 {
-	pidgin_pounces_manager_show_with_parent(NULL);
-}
-
-void
-pidgin_pounces_manager_show_with_parent(GtkWindow *parent)
-{
 	PouncesManager *dialog;
 	GtkWidget *bbox;
 	GtkWidget *button;
@@ -1334,7 +1321,6 @@
 
 	if (pounces_manager != NULL) {
 		gtk_window_present(GTK_WINDOW(pounces_manager->window));
-		gtk_window_set_transient_for(GTK_WINDOW(pounces_manager->window), parent);
 		return;
 	}
 
@@ -1345,7 +1331,6 @@
 
 	dialog->window = win = pidgin_create_window(_("Buddy Pounces"), PIDGIN_HIG_BORDER, "pounces", TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(win), width, height);
-	gtk_window_set_transient_for(GTK_WINDOW(win), parent);
 
 	g_signal_connect(G_OBJECT(win), "delete_event",
 					 G_CALLBACK(pounces_manager_destroy_cb), dialog);
--- a/pidgin/gtkpounce.h	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkpounce.h	Fri Nov 16 23:01:09 2007 +0000
@@ -28,48 +28,20 @@
 
 #include "pounce.h"
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
  *
  * @param account    The optional account to use.
  * @param name       The optional name to pounce on.
  * @param cur_pounce The current buddy pounce, if editing an existing one.
- *
- * @deprecated Use pidgin_pounce_editor_show_with_parent() instead.
  */
 void pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
 								PurplePounce *cur_pounce);
-#endif
-
-/**
- * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
- *
- * @param parent     The parent window.
- * @param account    The optional account to use.
- * @param name       The optional name to pounce on.
- * @param cur_pounce The current buddy pounce, if editing an existing one.
- *
- * @since 2.3.0
- */
-void pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name,
-								PurplePounce *cur_pounce);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Shows the pounces manager window.
- *
- * @deprecated Use pidgin_pounces_manager_show_with_parent() instead.
- */
-void pidgin_pounces_manager_show(void);
-#endif
 
 /**
  * Shows the pounces manager window.
- *
- * @since 2.3.0
  */
-void pidgin_pounces_manager_show_with_parent(GtkWindow *parent);
+void pidgin_pounces_manager_show(void);
 
 /**
  * Hides the pounces manager window.
--- a/pidgin/gtkprivacy.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkprivacy.c	Fri Nov 16 23:01:09 2007 +0000
@@ -88,8 +88,6 @@
 
 static PidginPrivacyDialog *privacy_dialog = NULL;
 
-#define PIDGIN_REQUEST_HINT_PRIVACY "privacy"
-
 static void
 rebuild_allow_list(PidginPrivacyDialog *dialog)
 {
@@ -369,7 +367,7 @@
 
 	dialog = g_new0(PidginPrivacyDialog, 1);
 
-	dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, PIDGIN_REQUEST_HINT_PRIVACY, TRUE);
+	dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, "privacy", TRUE);
 
 	g_signal_connect(G_OBJECT(dialog->win), "delete_event",
 					 G_CALLBACK(destroy_cb), dialog);
@@ -564,7 +562,7 @@
 			_("_Permit"), G_CALLBACK(add_permit_block_cb),
 			_("Cancel"), G_CALLBACK(destroy_request_data),
 			account, name, NULL,
-			PIDGIN_REQUEST_HINT_PRIVACY, data);
+			"privacy", data);
 	}
 	else {
 		char *primary = g_strdup_printf(_("Allow %s to contact you?"), name);
@@ -576,7 +574,7 @@
 		purple_request_action_with_hint(account, _("Permit User"), primary, secondary,
 							0,
 							account, name, NULL,
-							PIDGIN_REQUEST_HINT_PRIVACY, data, 2,
+							"privacy", data, 2,
 							_("_Permit"), G_CALLBACK(confirm_permit_block_cb),
 							_("Cancel"), G_CALLBACK(destroy_request_data));
 
@@ -605,7 +603,7 @@
 			_("_Block"), G_CALLBACK(add_permit_block_cb),
 			_("Cancel"), G_CALLBACK(destroy_request_data),
 			account, name, NULL,
-			PIDGIN_REQUEST_HINT_PRIVACY, data);
+			"privacy", data);
 	}
 	else {
 		char *primary = g_strdup_printf(_("Block %s?"), name);
@@ -615,7 +613,7 @@
 		purple_request_action_with_hint(account, _("Block User"), primary, secondary,
 							0,
 							account, name, NULL,
-							PIDGIN_REQUEST_HINT_PRIVACY, data, 2,
+							"privacy", data, 2,
 							_("_Block"), G_CALLBACK(confirm_permit_block_cb),
 							_("Cancel"), G_CALLBACK(destroy_request_data));
 
--- a/pidgin/gtkrequest.c	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/gtkrequest.c	Fri Nov 16 23:01:09 2007 +0000
@@ -106,16 +106,16 @@
 	if (convo)
 		return GTK_WINDOW(convo->win->window);
 
-	if (strcmp(ui_hint, PURPLE_REQUEST_HINT_BLIST)) {
+	if (strcmp(ui_hint, "blist")) {
 		GList *ll_toplevels = NULL;
 
 		ll_toplevels = gtk_window_list_toplevels();
 
 		if (!(toplevel = find_toplevel(ll_toplevels, ui_hint))) {
-			if (!strcmp(ui_hint, PURPLE_REQUEST_HINT_REGISTER))
+			if (!strcmp(ui_hint, "register-account"))
 				toplevel = find_toplevel(ll_toplevels, "account");
 			else
-			if (!strcmp(ui_hint, PURPLE_REQUEST_HINT_XFER))
+			if (!strcmp(ui_hint, "xfer"))
 				toplevel = find_toplevel(ll_toplevels, "file transfer");
 		}
 		
--- a/pidgin/plugins/perl/common/GtkDialogs.xs	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkDialogs.xs	Fri Nov 16 23:01:09 2007 +0000
@@ -10,10 +10,6 @@
 pidgin_dialogs_about()
 
 void
-pidgin_dialogs_about_with_parent(parent)
-	void * parent
-
-void
 pidgin_dialogs_im()
 
 void
--- a/pidgin/plugins/perl/common/GtkLog.xs	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkLog.xs	Fri Nov 16 23:01:09 2007 +0000
@@ -13,27 +13,11 @@
 	Purple::Account account
 
 void
-pidgin_log_show_with_parent(parent, type, screenname, account)
-	void * parent
-	Purple::LogType type
-	const char * screenname
-	Purple::Account account
-
-void
 pidgin_log_show_contact(contact)
 	Purple::BuddyList::Contact contact
 
-void
-pidgin_log_show_contact_with_parent(parent, contact)
-	void * parent
-	Purple::BuddyList::Contact contact
-
 MODULE = Pidgin::Log  PACKAGE = Pidgin::SysLog  PREFIX = pidgin_syslog_
 PROTOTYPES: ENABLE
 
 void
 pidgin_syslog_show()
-
-void
-pidgin_syslog_show_with_parent(parent)
-	void * parent
--- a/pidgin/plugins/perl/common/GtkPlugin.xs	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPlugin.xs	Fri Nov 16 23:01:09 2007 +0000
@@ -11,7 +11,3 @@
 
 void
 pidgin_plugin_dialog_show()
-
-void
-pidgin_plugin_dialog_show_with_parent(parent)
-	void * parent
--- a/pidgin/plugins/perl/common/GtkPounce.xs	Fri Nov 16 23:00:55 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPounce.xs	Fri Nov 16 23:01:09 2007 +0000
@@ -9,13 +9,6 @@
 	const char * name
 	Purple::Pounce cur_pounce
 
-void
-pidgin_pounce_editor_show_with_parent(parent, account, name, cur_pounce)
-	void * parent
-	Purple::Account account
-	const char * name
-	Purple::Pounce cur_pounce
-
 MODULE = Pidgin::Pounce  PACKAGE = Pidgin::Pounces  PREFIX = pidgin_pounces_
 PROTOTYPES: ENABLE
 
@@ -29,8 +22,4 @@
 pidgin_pounces_manager_show()
 
 void
-pidgin_pounces_manager_show_with_parent(parent)
-	void * parent
-
-void
 pidgin_pounces_manager_hide()