conversation.h | conversation.h | |||
---|---|---|---|---|
skipping to change at line 273 | skipping to change at line 273 | |||
PurpleBuddyIcon *icon; /**< The buddy icon. */ | PurpleBuddyIcon *icon; /**< The buddy icon. */ | |||
}; | }; | |||
/** | /** | |||
* Data specific to Chats. | * Data specific to Chats. | |||
*/ | */ | |||
struct _PurpleConvChat | struct _PurpleConvChat | |||
{ | { | |||
PurpleConversation *conv; /**< The parent conversation. */ | PurpleConversation *conv; /**< The parent conversation. */ | |||
GList *in_room; /**< The users in the room. | GList *in_room; /**< The users in the room. | |||
*/ | * @deprecated Will be removed in | |||
3.0.0 | ||||
*/ | ||||
GList *ignored; /**< Ignored users. */ | GList *ignored; /**< Ignored users. */ | |||
char *who; /**< The person who set the topic. */ | char *who; /**< The person who set the topic. */ | |||
char *topic; /**< The topic. */ | char *topic; /**< The topic. */ | |||
int id; /**< The chat ID. */ | int id; /**< The chat ID. */ | |||
char *nick; /**< Your nick in this chat. */ | char *nick; /**< Your nick in this chat. */ | |||
gboolean left; /**< We left the chat and kept the window open */ | gboolean left; /**< We left the chat and kept the window open */ | |||
GHashTable *users; /**< Hash table of the users in the | ||||
room. | ||||
* @since 2.9.0 | ||||
*/ | ||||
}; | }; | |||
/** | /** | |||
* Data for "Chat Buddies" | * Data for "Chat Buddies" | |||
*/ | */ | |||
struct _PurpleConvChatBuddy | struct _PurpleConvChatBuddy | |||
{ | { | |||
char *name; /**< The chat participant's name in the chat. */ | char *name; /**< The chat participant's name in the chat. */ | |||
char *alias; /**< The chat participant's alias, if known; | char *alias; /**< The chat participant's alias, if known; | |||
* @a NULL otherwise. | * @a NULL otherwise. | |||
skipping to change at line 306 | skipping to change at line 311 | |||
*/ | */ | |||
gboolean buddy; /**< @a TRUE if this chat participa nt is on the | gboolean buddy; /**< @a TRUE if this chat participa nt is on the | |||
* buddy list; @a FALSE otherwise . | * buddy list; @a FALSE otherwise . | |||
*/ | */ | |||
PurpleConvChatBuddyFlags flags; /**< A bitwise OR of flags for this participant, | PurpleConvChatBuddyFlags flags; /**< A bitwise OR of flags for this participant, | |||
* such as whether they are a cha nnel operator. | * such as whether they are a cha nnel operator. | |||
*/ | */ | |||
GHashTable *attributes; /**< A hash table of attributes abo ut the user, such as | GHashTable *attributes; /**< A hash table of attributes abo ut the user, such as | |||
* real name, user@host, etc. | * real name, user@host, etc. | |||
*/ | */ | |||
gpointer ui_data; /** < The UI can put whatever it wa nts here. */ | ||||
}; | }; | |||
/** | /** | |||
* Description of a conversation message | * Description of a conversation message | |||
* | * | |||
* @since 2.2.0 | * @since 2.2.0 | |||
*/ | */ | |||
struct _PurpleConvMessage | struct _PurpleConvMessage | |||
{ | { | |||
char *who; | char *who; | |||
skipping to change at line 1060 | skipping to change at line 1066 | |||
* Sets the list of users in the chat room. | * Sets the list of users in the chat room. | |||
* | * | |||
* @note Calling this function will not update the display of the users. | * @note Calling this function will not update the display of the users. | |||
* Please use purple_conv_chat_add_user(), purple_conv_chat_add_users (), | * Please use purple_conv_chat_add_user(), purple_conv_chat_add_users (), | |||
* purple_conv_chat_remove_user(), and purple_conv_chat_remove_users( ) instead. | * purple_conv_chat_remove_user(), and purple_conv_chat_remove_users( ) instead. | |||
* | * | |||
* @param chat The chat. | * @param chat The chat. | |||
* @param users The list of users. | * @param users The list of users. | |||
* | * | |||
* @return The list passed. | * @return The list passed. | |||
* | ||||
* @deprecated This function will be removed in 3.0.0. You shouldn't be us | ||||
ing it anyway. | ||||
*/ | */ | |||
GList *purple_conv_chat_set_users(PurpleConvChat *chat, GList *users); | GList *purple_conv_chat_set_users(PurpleConvChat *chat, GList *users); | |||
/** | /** | |||
* Returns a list of users in the chat room. The members of the list | * Returns a list of users in the chat room. The members of the list | |||
* are PurpleConvChatBuddy objects. | * are PurpleConvChatBuddy objects. | |||
* | * | |||
* @param chat The chat. | * @param chat The chat. | |||
* | * | |||
* @constreturn The list of users. | * @constreturn The list of users. | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 12 lines changed or added | |||
gtkutils.h | gtkutils.h | |||
---|---|---|---|---|
skipping to change at line 832 | skipping to change at line 832 | |||
* @param widget The GtkWidget to add. | * @param widget The GtkWidget to add. | |||
* @param expand Whether to expand the widget horizontally. | * @param expand Whether to expand the widget horizontally. | |||
* @param p_label Place to store a pointer to the GtkLabel, or @c NULL if you don't care. | * @param p_label Place to store a pointer to the GtkLabel, or @c NULL if you don't care. | |||
* | * | |||
* @return A GtkHBox already added to the GtkVBox containing the GtkLabel and the GtkWidget. | * @return A GtkHBox already added to the GtkVBox containing the GtkLabel and the GtkWidget. | |||
* @since 2.4.0 | * @since 2.4.0 | |||
*/ | */ | |||
GtkWidget *pidgin_add_widget_to_vbox(GtkBox *vbox, const char *widget_label , GtkSizeGroup *sg, GtkWidget *widget, gboolean expand, GtkWidget **p_label ); | GtkWidget *pidgin_add_widget_to_vbox(GtkBox *vbox, const char *widget_label , GtkSizeGroup *sg, GtkWidget *widget, gboolean expand, GtkWidget **p_label ); | |||
/** | /** | |||
* Create a GdkPixbuf from a chunk of image data. | ||||
* | ||||
* @param buf The raw binary image data. | ||||
* @param count The length of buf in bytes. | ||||
* | ||||
* @return A GdkPixbuf created from the image data, or NULL if | ||||
* there was an error parsing the data. | ||||
* | ||||
* @since 2.9.0 | ||||
*/ | ||||
GdkPixbuf *pidgin_pixbuf_from_data(const guchar *buf, gsize count); | ||||
/** | ||||
* Create a GdkPixbufAnimation from a chunk of image data. | ||||
* | ||||
* @param buf The raw binary image data. | ||||
* @param count The length of buf in bytes. | ||||
* | ||||
* @return A GdkPixbufAnimation created from the image data, or NULL if | ||||
* there was an error parsing the data. | ||||
* | ||||
* @since 2.9.0 | ||||
*/ | ||||
GdkPixbufAnimation *pidgin_pixbuf_anim_from_data(const guchar *buf, gsize c | ||||
ount); | ||||
/** | ||||
* Create a GdkPixbuf from a PurpleStoredImage. | * Create a GdkPixbuf from a PurpleStoredImage. | |||
* | * | |||
* @param image A PurpleStoredImage. | * @param image A PurpleStoredImage. | |||
* | * | |||
* @return A GdkPixbuf created from the stored image. | * @return A GdkPixbuf created from the stored image. | |||
* | * | |||
* @since 2.5.0 | * @since 2.5.0 | |||
*/ | */ | |||
GdkPixbuf *pidgin_pixbuf_from_imgstore(PurpleStoredImage *image); | GdkPixbuf *pidgin_pixbuf_from_imgstore(PurpleStoredImage *image); | |||
/** | /** | |||
* Helper function that calls gdk_pixbuf_new_from_file() and checks both | ||||
* the return code and the GError and returns NULL if either one failed. | ||||
* | ||||
* The gdk-pixbuf documentation implies that it is sufficient to check | ||||
* the return value of gdk_pixbuf_new_from_file() to determine | ||||
* whether the image was able to be loaded. However, this is not the case | ||||
* with gdk-pixbuf 2.23.3 and probably many earlier versions. In some | ||||
* cases a GdkPixbuf object is returned that will cause some operations | ||||
* (like gdk_pixbuf_scale_simple()) to rapidly consume memory in an | ||||
* infinite loop. | ||||
* | ||||
* This function shouldn't be necessary once Pidgin requires a version of | ||||
* gdk-pixbuf where the aforementioned bug is fixed. However, it might be | ||||
* nice to keep this function around for the debug message that it logs. | ||||
* | ||||
* @param filename Name of file to load, in the GLib file name encoding | ||||
* | ||||
* @return The GdkPixbuf if successful. Otherwise NULL is returned and | ||||
* a warning is logged. | ||||
* | ||||
* @since 2.9.0 | ||||
*/ | ||||
GdkPixbuf *pidgin_pixbuf_new_from_file(const char *filename); | ||||
/** | ||||
* Helper function that calls gdk_pixbuf_new_from_file_at_size() and checks | ||||
* both the return code and the GError and returns NULL if either one faile | ||||
d. | ||||
* | ||||
* The gdk-pixbuf documentation implies that it is sufficient to check | ||||
* the return value of gdk_pixbuf_new_from_file_at_size() to determine | ||||
* whether the image was able to be loaded. However, this is not the case | ||||
* with gdk-pixbuf 2.23.3 and probably many earlier versions. In some | ||||
* cases a GdkPixbuf object is returned that will cause some operations | ||||
* (like gdk_pixbuf_scale_simple()) to rapidly consume memory in an | ||||
* infinite loop. | ||||
* | ||||
* This function shouldn't be necessary once Pidgin requires a version of | ||||
* gdk-pixbuf where the aforementioned bug is fixed. However, it might be | ||||
* nice to keep this function around for the debug message that it logs. | ||||
* | ||||
* @param filename Name of file to load, in the GLib file name encoding | ||||
* @param width The width the image should have or -1 to not constrain the | ||||
width | ||||
* @param height The height the image should have or -1 to not constrain th | ||||
e height | ||||
* | ||||
* @return The GdkPixbuf if successful. Otherwise NULL is returned and | ||||
* a warning is logged. | ||||
* | ||||
* @since 2.9.0 | ||||
*/ | ||||
GdkPixbuf *pidgin_pixbuf_new_from_file_at_size(const char *filename, int wi | ||||
dth, int height); | ||||
/** | ||||
* Helper function that calls gdk_pixbuf_new_from_file_at_scale() and check | ||||
s | ||||
* both the return code and the GError and returns NULL if either one faile | ||||
d. | ||||
* | ||||
* The gdk-pixbuf documentation implies that it is sufficient to check | ||||
* the return value of gdk_pixbuf_new_from_file_at_scale() to determine | ||||
* whether the image was able to be loaded. However, this is not the case | ||||
* with gdk-pixbuf 2.23.3 and probably many earlier versions. In some | ||||
* cases a GdkPixbuf object is returned that will cause some operations | ||||
* (like gdk_pixbuf_scale_simple()) to rapidly consume memory in an | ||||
* infinite loop. | ||||
* | ||||
* This function shouldn't be necessary once Pidgin requires a version of | ||||
* gdk-pixbuf where the aforementioned bug is fixed. However, it might be | ||||
* nice to keep this function around for the debug message that it logs. | ||||
* | ||||
* @param filename Name of file to load, in the GLib file name encoding | ||||
* @param width The width the image should have or -1 to not constrain the | ||||
width | ||||
* @param height The height the image should have or -1 to not constrain th | ||||
e height | ||||
* @param preserve_aspect_ratio TRUE to preserve the image's aspect ratio | ||||
* | ||||
* @return The GdkPixbuf if successful. Otherwise NULL is returned and | ||||
* a warning is logged. | ||||
* | ||||
* @since 2.9.0 | ||||
*/ | ||||
GdkPixbuf *pidgin_pixbuf_new_from_file_at_scale(const char *filename, int w | ||||
idth, int height, gboolean preserve_aspect_ratio); | ||||
/** | ||||
* Add scrollbars to a widget | * Add scrollbars to a widget | |||
* @param widget The child widget | * @param widget The child widget | |||
* @hscrollbar_policy Horizontal scrolling policy | * @hscrollbar_policy Horizontal scrolling policy | |||
* @vscrollbar_policy Vertical scrolling policy | * @vscrollbar_policy Vertical scrolling policy | |||
* @shadow Shadow type | * @shadow Shadow type | |||
* @width Desired widget width, or -1 for default | * @width Desired widget width, or -1 for default | |||
* @height Desired widget height, or -1 for default | * @height Desired widget height, or -1 for default | |||
* | * | |||
* @since 2.8.0 | * @since 2.8.0 | |||
*/ | */ | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 116 lines changed or added | |||
value.h | value.h | |||
---|---|---|---|---|
skipping to change at line 81 | skipping to change at line 81 | |||
PURPLE_SUBTYPE_PLUGIN, | PURPLE_SUBTYPE_PLUGIN, | |||
PURPLE_SUBTYPE_BLIST_NODE, | PURPLE_SUBTYPE_BLIST_NODE, | |||
PURPLE_SUBTYPE_CIPHER, | PURPLE_SUBTYPE_CIPHER, | |||
PURPLE_SUBTYPE_STATUS, | PURPLE_SUBTYPE_STATUS, | |||
PURPLE_SUBTYPE_LOG, | PURPLE_SUBTYPE_LOG, | |||
PURPLE_SUBTYPE_XFER, | PURPLE_SUBTYPE_XFER, | |||
PURPLE_SUBTYPE_SAVEDSTATUS, | PURPLE_SUBTYPE_SAVEDSTATUS, | |||
PURPLE_SUBTYPE_XMLNODE, | PURPLE_SUBTYPE_XMLNODE, | |||
PURPLE_SUBTYPE_USERINFO, | PURPLE_SUBTYPE_USERINFO, | |||
PURPLE_SUBTYPE_STORED_IMAGE, | PURPLE_SUBTYPE_STORED_IMAGE, | |||
PURPLE_SUBTYPE_CERTIFICATEPOOL | PURPLE_SUBTYPE_CERTIFICATEPOOL, | |||
PURPLE_SUBTYPE_CHATBUDDY | ||||
} PurpleSubType; | } PurpleSubType; | |||
/** | /** | |||
* A wrapper for a type, subtype, and specific type of value. | * A wrapper for a type, subtype, and specific type of value. | |||
*/ | */ | |||
typedef struct | typedef struct | |||
{ | { | |||
PurpleType type; | PurpleType type; | |||
unsigned short flags; | unsigned short flags; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added | |||
version.h | version.h | |||
---|---|---|---|---|
skipping to change at line 30 | skipping to change at line 30 | |||
* You should have received a copy of the GNU General Public License | * You should have received a copy of the GNU General Public License | |||
* along with this program; if not, write to the Free Software | * along with this program; if not, write to the Free Software | |||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA | |||
*/ | */ | |||
#ifndef _PURPLE_VERSION_H_ | #ifndef _PURPLE_VERSION_H_ | |||
#define _PURPLE_VERSION_H_ | #define _PURPLE_VERSION_H_ | |||
/** The major version of the running libpurple. */ | /** The major version of the running libpurple. */ | |||
#define PURPLE_MAJOR_VERSION (2) | #define PURPLE_MAJOR_VERSION (2) | |||
/** The minor version of the running libpurple. */ | /** The minor version of the running libpurple. */ | |||
#define PURPLE_MINOR_VERSION (8) | #define PURPLE_MINOR_VERSION (9) | |||
/** The micro version of the running libpurple. */ | /** The micro version of the running libpurple. */ | |||
#define PURPLE_MICRO_VERSION (0) | #define PURPLE_MICRO_VERSION (0) | |||
#define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \ | #define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \ | |||
((y ) < PURPLE_MINOR_VERSION || \ | ((y ) < PURPLE_MINOR_VERSION || \ | |||
(( y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION))) | (( y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION))) | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||