cmds.h   cmds.h 
skipping to change at line 33 skipping to change at line 33
#ifndef _PURPLE_CMDS_H_ #ifndef _PURPLE_CMDS_H_
#define _PURPLE_CMDS_H_ #define _PURPLE_CMDS_H_
#include "conversation.h" #include "conversation.h"
/************************************************************************** / /************************************************************************** /
/** @name Structures * / /** @name Structures * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
typedef enum _PurpleCmdPriority PurpleCmdPriority;
typedef enum _PurpleCmdFlag PurpleCmdFlag;
typedef enum _PurpleCmdStatus PurpleCmdStatus;
typedef enum _PurpleCmdRet PurpleCmdRet;
enum _PurpleCmdStatus { enum _PurpleCmdStatus {
PURPLE_CMD_STATUS_OK, PURPLE_CMD_STATUS_OK,
PURPLE_CMD_STATUS_FAILED, PURPLE_CMD_STATUS_FAILED,
PURPLE_CMD_STATUS_NOT_FOUND, PURPLE_CMD_STATUS_NOT_FOUND,
PURPLE_CMD_STATUS_WRONG_ARGS, PURPLE_CMD_STATUS_WRONG_ARGS,
PURPLE_CMD_STATUS_WRONG_PRPL, PURPLE_CMD_STATUS_WRONG_PRPL,
PURPLE_CMD_STATUS_WRONG_TYPE, PURPLE_CMD_STATUS_WRONG_TYPE,
}; };
enum _PurpleCmdRet { enum _PurpleCmdRet {
PURPLE_CMD_RET_OK, /**< Everything's okay. Don't look for anot her command to call. */ PURPLE_CMD_RET_OK, /**< Everything's okay. Don't look for anot her command to call. */
PURPLE_CMD_RET_FAILED, /**< The command failed, but stop looking.* / PURPLE_CMD_RET_FAILED, /**< The command failed, but stop looking.* /
PURPLE_CMD_RET_CONTINUE, /**< Continue, looking for other commands w ith the same name to call. */ PURPLE_CMD_RET_CONTINUE, /**< Continue, looking for other commands w ith the same name to call. */
}; };
#define PURPLE_CMD_FUNC(func) ((PurpleCmdFunc)func) #define PURPLE_CMD_FUNC(func) ((PurpleCmdFunc)func)
typedef PurpleCmdRet (*PurpleCmdFunc)(PurpleConversation *, const gchar *cm d, typedef enum _PurpleCmdRet (*PurpleCmdFunc)(PurpleConversation *, const gch ar *cmd,
gchar **args, gchar **error, void *data); gchar **args, gchar **error, void *data);
typedef guint PurpleCmdId; typedef guint PurpleCmdId;
enum _PurpleCmdPriority { enum _PurpleCmdPriority {
PURPLE_CMD_P_VERY_LOW = -1000, PURPLE_CMD_P_VERY_LOW = -1000,
PURPLE_CMD_P_LOW = 0, PURPLE_CMD_P_LOW = 0,
PURPLE_CMD_P_DEFAULT = 1000, PURPLE_CMD_P_DEFAULT = 1000,
PURPLE_CMD_P_PRPL = 2000, PURPLE_CMD_P_PRPL = 2000,
PURPLE_CMD_P_PLUGIN = 3000, PURPLE_CMD_P_PLUGIN = 3000,
PURPLE_CMD_P_ALIAS = 4000, PURPLE_CMD_P_ALIAS = 4000,
skipping to change at line 87 skipping to change at line 82
/** Command is usable in IMs. */ /** Command is usable in IMs. */
PURPLE_CMD_FLAG_IM = 0x01, PURPLE_CMD_FLAG_IM = 0x01,
/** Command is usable in multi-user chats. */ /** Command is usable in multi-user chats. */
PURPLE_CMD_FLAG_CHAT = 0x02, PURPLE_CMD_FLAG_CHAT = 0x02,
/** Command is usable only for a particular prpl. */ /** Command is usable only for a particular prpl. */
PURPLE_CMD_FLAG_PRPL_ONLY = 0x04, PURPLE_CMD_FLAG_PRPL_ONLY = 0x04,
/** Incorrect arguments to this command should be accepted anyway. * / /** Incorrect arguments to this command should be accepted anyway. * /
PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS = 0x08, PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS = 0x08,
}; };
typedef enum _PurpleCmdPriority PurpleCmdPriority;
typedef enum _PurpleCmdFlag PurpleCmdFlag;
typedef enum _PurpleCmdStatus PurpleCmdStatus;
typedef enum _PurpleCmdRet PurpleCmdRet;
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/************************************************************************** / /************************************************************************** /
/** @name Commands API * / /** @name Commands API * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
 End of changes. 3 change blocks. 
6 lines changed or deleted 6 lines changed or added


 gnt.h   gnt.h 
skipping to change at line 33 skipping to change at line 33
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* 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 GNT_H
#define GNT_H
#include <glib.h> #include <glib.h>
#include "gntwidget.h" #include "gntwidget.h"
#include "gntclipboard.h" #include "gntclipboard.h"
#include "gntcolors.h" #include "gntcolors.h"
#include "gntkeys.h" #include "gntkeys.h"
/** /**
* Get things to compile in Glib < 2.8 * Get things to compile in Glib < 2.8
*/ */
#if !GLIB_CHECK_VERSION(2,8,0) #if !GLIB_CHECK_VERSION(2,8,0)
skipping to change at line 203 skipping to change at line 206
gint *stin, gint *stout, gint *sterr, gint *stin, gint *stout, gint *sterr,
void (*callback)(int status, gpointer data), gpointer data); void (*callback)(int status, gpointer data), gpointer data);
/** /**
* Check whether a child process is in control of the current terminal. * Check whether a child process is in control of the current terminal.
* *
* @return @c TRUE if a child process (eg., PAGER) is occupying the current * @return @c TRUE if a child process (eg., PAGER) is occupying the current
* terminal, @c FALSE otherwise. * terminal, @c FALSE otherwise.
*/ */
gboolean gnt_is_refugee(void); gboolean gnt_is_refugee(void);
#endif /* GNT_H */
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 version.h   version.h 
skipping to change at line 29 skipping to change at line 29
* *
* 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_
#define PURPLE_MAJOR_VERSION (2) #define PURPLE_MAJOR_VERSION (2)
#define PURPLE_MINOR_VERSION (3) #define PURPLE_MINOR_VERSION (3)
#define PURPLE_MICRO_VERSION (0) #define PURPLE_MICRO_VERSION (1)
#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

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/