Mercurial > pidgin.yaz
changeset 13327:b7b31c69ade6
[gaim-migrate @ 15697]
Whitespace, comments, and a warning fix
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 25 Feb 2006 22:31:53 +0000 |
| parents | 3955245c82f6 |
| children | 696b06b33969 |
| files | src/gtkprefs.c src/network.h src/prpl.h |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkprefs.c Sat Feb 25 21:17:58 2006 +0000 +++ b/src/gtkprefs.c Sat Feb 25 22:31:53 2006 +0000 @@ -1748,7 +1748,7 @@ GAIM_PREF_STRING, "/core/away/idle_reporting", _("Never"), "none", _("From last sent message"), "gaim", -#ifdef USE_SCREENSAVER || defined(HAVE_IOKIT) +#if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT) _("Based on keyboard or mouse use"), "system", #endif NULL);
--- a/src/network.h Sat Feb 25 21:17:58 2006 +0000 +++ b/src/network.h Sat Feb 25 22:31:53 2006 +0000 @@ -25,6 +25,11 @@ #ifndef _GAIM_NETWORK_H_ #define _GAIM_NETWORK_H_ +/* + * TODO: This API needs a way to cancel pending calls to + * gaim_network_listen_range() and company. + */ + #ifdef __cplusplus extern "C" { #endif @@ -136,7 +141,7 @@ * If a range is specified in preferences, these values are used. * If a non-0 values are passed to the function as parameters, these * values are used. - * Otherwise a port is chosen at random by the kernel. + * Otherwise a port is chosen at random by the operating system. * * This opens a listening port. The caller will want to set up a watcher * of type GAIM_INPUT_READ on the fd returned in cb. It will probably call
--- a/src/prpl.h Sat Feb 25 21:17:58 2006 +0000 +++ b/src/prpl.h Sat Feb 25 22:31:53 2006 +0000 @@ -47,7 +47,7 @@ * Dimensions less than 1 should be ignored and the image not scaled. */ typedef struct { - char *format; /**< This is a comma-delimited list of image formats or NULL if icons are not supported. + char *format; /**< This is a comma-delimited list of image formats or NULL if icons are not supported. * The core nor the prpl will actually check to see if the data it's given matches this, it's entirely * up to the UI to do what it wants */ int min_width; /**< The minimum width of this icon */ @@ -295,7 +295,7 @@ gboolean (*can_receive_file)(GaimConnection *, const char *who); void (*send_file)(GaimConnection *, const char *who, const char *filename); GaimXfer *(*new_xfer)(GaimConnection *, const char *who); - gboolean (*offline_message)(const GaimBuddy *buddy); + gboolean (*offline_message)(const GaimBuddy *buddy); GaimWhiteboardPrplOps *whiteboard_prpl_ops; };