im.pidgin.pidgin.next.minor: 0e51fd6f70ba330cbc25cff479b5c6325e939196
rlaager at pidgin.im
rlaager at pidgin.im
Sat Oct 13 23:27:25 EDT 2007
-----------------------------------------------------------------
Revision: 0e51fd6f70ba330cbc25cff479b5c6325e939196
Ancestor: 2ce5a939a395a946ffcf7f9c862b4c54aba7457f
Author: rlaager at pidgin.im
Date: 2007-10-14T03:14:43
Branch: im.pidgin.pidgin.next.minor
Modified files:
libpurple/request.h pidgin/gtkdialogs.h pidgin/gtklog.h
pidgin/gtkplugin.h pidgin/gtkpounce.h
ChangeLog:
Wrap the newly deprecated functions with #ifndef PURPLE_DISABLE_DEPRECATED.
-------------- next part --------------
============================================================
--- libpurple/request.h 4073e0efebdf9616625f28c730b716b3275cfb3e
+++ libpurple/request.h 0566bed07c3420544ea2b2f38b2b705027573c75
@@ -1315,6 +1315,7 @@ void *purple_request_input_with_hint(voi
PurpleAccount *account, const char *who, PurpleConversation *conv,
const char *ui_hint, void *user_data);
+#ifndef PURPLE_DISABLE_DEPRECATED
/**
* Prompts the user for text input.
*
@@ -1362,6 +1363,7 @@ void *purple_request_input(void *handle,
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.
@@ -1397,6 +1399,7 @@ void *purple_request_choice_with_hint(vo
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.
*
@@ -1430,6 +1433,7 @@ void *purple_request_choice(void *handle
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.
@@ -1465,6 +1469,7 @@ void *purple_request_choice_varg_with_hi
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.
*
@@ -1498,6 +1503,7 @@ void *purple_request_choice_varg(void *h
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.
@@ -1535,6 +1541,7 @@ void *purple_request_action_with_hint(vo
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.
*
@@ -1570,6 +1577,7 @@ void *purple_request_action(void *handle
int default_action,
PurpleAccount *account, const char *who, PurpleConversation *conv,
void *user_data, size_t action_count, ...);
+#endif
/**
* Prompts the user for an action.
@@ -1602,6 +1610,7 @@ void *purple_request_action_varg_with_hi
const char *ui_hint, void *user_data, size_t action_count,
va_list actions);
+#ifndef PURPLE_DISABLE_DEPRECATED
/**
* Prompts the user for an action.
*
@@ -1632,6 +1641,7 @@ void *purple_request_action_varg(void *h
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.
@@ -1665,6 +1675,7 @@ void *purple_request_fields_with_hint(vo
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.
*
@@ -1696,6 +1707,7 @@ void *purple_request_fields(void *handle
const char *cancel_text, GCallback cancel_cb,
PurpleAccount *account, const char *who, PurpleConversation *conv,
void *user_data);
+#endif
/**
* Closes a request.
@@ -1724,6 +1736,7 @@ void purple_request_close_with_handle(vo
(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.
*
@@ -1735,6 +1748,7 @@ void purple_request_close_with_handle(vo
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.
@@ -1748,6 +1762,7 @@ void purple_request_close_with_handle(vo
(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.
*
@@ -1759,6 +1774,7 @@ void purple_request_close_with_handle(vo
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.
@@ -1772,6 +1788,7 @@ void purple_request_close_with_handle(vo
(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.
*
@@ -1783,6 +1800,7 @@ void purple_request_close_with_handle(vo
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
@@ -1813,6 +1831,7 @@ void *purple_request_file_with_hint(void
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.
@@ -1841,6 +1860,7 @@ void *purple_request_file(void *handle,
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
@@ -1868,6 +1888,7 @@ void *purple_request_folder_with_hint(vo
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.
@@ -1893,6 +1914,7 @@ void *purple_request_folder(void *handle
GCallback ok_cb, GCallback cancel_cb,
PurpleAccount *account, const char *who, PurpleConversation *conv,
void *user_data);
+#endif
/*@}*/
============================================================
--- pidgin/gtkdialogs.h 7b9af3871e3bc0a228cd3e4f51c3bce9e739243a
+++ pidgin/gtkdialogs.h bf228122236d90cc43a481ee888a9ff2ced1612f
@@ -34,10 +34,12 @@ void pidgin_dialogs_destroy_all(void);
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
@@ -49,11 +51,13 @@ void pidgin_dialogs_log(void);
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 *);
============================================================
--- pidgin/gtklog.h 702c0aff2d7695fed34d4d4fbe0a0fe41eee86b1
+++ pidgin/gtklog.h 55207eb4df27e1f941cad1b2ac54407f043f86d6
@@ -52,30 +52,36 @@ struct _PidginLogViewer {
};
+#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
============================================================
--- pidgin/gtkplugin.h 23840fd26885510b6cb8726a34c814efd06f6ab5
+++ pidgin/gtkplugin.h 2e2b52ab5409a796f6d24bb32b87b12b1223fe48
@@ -72,12 +72,14 @@ void pidgin_plugins_save(void);
*/
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
============================================================
--- pidgin/gtkpounce.h a67a6ef18843fcfd268e0825308ef3afc424f141
+++ pidgin/gtkpounce.h 9cd0564f57698ebc2d5c384a84a4d969834be503
@@ -28,6 +28,7 @@
#include "pounce.h"
+#ifndef PURPLE_DISABLE_DEPRECATED
/**
* Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
*
@@ -39,6 +40,7 @@ void pidgin_pounce_editor_show(PurpleAcc
*/
void pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
PurplePounce *cur_pounce);
+#endif
/**
* Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
@@ -53,12 +55,14 @@ void pidgin_pounce_editor_show_with_pare
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.
More information about the Commits
mailing list