unique.h   unique.h 
skipping to change at line 26 skipping to change at line 26
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA * 02110-1301 USA
*/ */
#ifndef __UNIQUE_H__ #ifndef __UNIQUE_H__
#define __UNIQUE_H__ #define __UNIQUE_H__
#include "uniqueapp.h" #include "uniqueapp.h"
#include "uniquebackend.h" #include "uniquebackend.h"
#include "uniqueenumtypes.h"
#include "uniquemessage.h" #include "uniquemessage.h"
#include "uniqueversion.h" #include "uniqueversion.h"
#endif /* __UNIQUE_H__ */ #endif /* __UNIQUE_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 uniqueapp.h   uniqueapp.h 
skipping to change at line 31 skipping to change at line 31
#ifndef __UNIQUE_APP_H__ #ifndef __UNIQUE_APP_H__
#define __UNIQUE_APP_H__ #define __UNIQUE_APP_H__
#include <glib-object.h> #include <glib-object.h>
#include <unique/uniquemessage.h> #include <unique/uniquemessage.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define UNIQUE_TYPE_COMMAND (unique_command_get_type ())
#define UNIQUE_TYPE_RESPONSE (unique_response_get_type ())
#define UNIQUE_TYPE_APP (unique_app_get_type ()) #define UNIQUE_TYPE_APP (unique_app_get_type ())
#define UNIQUE_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNIQUE_TYPE_APP, UniqueApp)) #define UNIQUE_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNIQUE_TYPE_APP, UniqueApp))
#define UNIQUE_IS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNIQUE_TYPE_APP)) #define UNIQUE_IS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNIQUE_TYPE_APP))
#define UNIQUE_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNIQUE_TYPE_APP, UniqueAppClass)) #define UNIQUE_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNIQUE_TYPE_APP, UniqueAppClass))
#define UNIQUE_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNIQUE_TYPE_APP)) #define UNIQUE_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNIQUE_TYPE_APP))
#define UNIQUE_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNIQUE_TYPE_APP, UniqueAppClass)) #define UNIQUE_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNIQUE_TYPE_APP, UniqueAppClass))
/** /**
* UniqueCommand: * UniqueCommand:
* @UNIQUE_INVALID: used internally * @UNIQUE_INVALID: used internally
skipping to change at line 61 skipping to change at line 59
* unique_app_add_command() function after creating a #UniqueApp instance * unique_app_add_command() function after creating a #UniqueApp instance
*/ */
typedef enum { /*< prefix=UNIQUE >*/ typedef enum { /*< prefix=UNIQUE >*/
UNIQUE_INVALID = 0, UNIQUE_INVALID = 0,
UNIQUE_ACTIVATE = -1, UNIQUE_ACTIVATE = -1,
UNIQUE_NEW = -2, UNIQUE_NEW = -2,
UNIQUE_OPEN = -3, UNIQUE_OPEN = -3,
UNIQUE_CLOSE = -4 UNIQUE_CLOSE = -4
} UniqueCommand; } UniqueCommand;
GType unique_command_get_type (void) G_GNUC_CONST;
/** /**
* UniqueResponse: * UniqueResponse:
* @UNIQUE_RESPONSE_INVALID: Internal error code, should never be used. * @UNIQUE_RESPONSE_INVALID: Internal error code, should never be used.
* @UNIQUE_RESPONSE_OK: The command was successfully executed. * @UNIQUE_RESPONSE_OK: The command was successfully executed.
* @UNIQUE_RESPONSE_CANCEL: The command was cancelled by the user. * @UNIQUE_RESPONSE_CANCEL: The command was cancelled by the user.
* @UNIQUE_RESPONSE_FAIL: The command failed due to a IPC failure. * @UNIQUE_RESPONSE_FAIL: The command failed due to a IPC failure.
* @UNIQUE_RESPONSE_PASSTHROUGH: The command was not handled * @UNIQUE_RESPONSE_PASSTHROUGH: The command was not handled
* *
* Response that a currently active instance of the application should * Response that a currently active instance of the application should
* return to the caller which sent a command. * return to the caller which sent a command.
*/ */
typedef enum { /*< prefix=UNIQUE_RESPONSE >*/ typedef enum { /*< prefix=UNIQUE_RESPONSE >*/
UNIQUE_RESPONSE_INVALID = 0, UNIQUE_RESPONSE_INVALID = 0,
UNIQUE_RESPONSE_OK, UNIQUE_RESPONSE_OK,
UNIQUE_RESPONSE_CANCEL, UNIQUE_RESPONSE_CANCEL,
UNIQUE_RESPONSE_FAIL, UNIQUE_RESPONSE_FAIL,
UNIQUE_RESPONSE_PASSTHROUGH UNIQUE_RESPONSE_PASSTHROUGH
} UniqueResponse; } UniqueResponse;
GType unique_response_get_type (void) G_GNUC_CONST;
typedef struct _UniqueApp UniqueApp; typedef struct _UniqueApp UniqueApp;
typedef struct _UniqueAppPrivate UniqueAppPrivate; typedef struct _UniqueAppPrivate UniqueAppPrivate;
typedef struct _UniqueAppClass UniqueAppClass; typedef struct _UniqueAppClass UniqueAppClass;
/** /**
* UniqueApp: * UniqueApp:
* *
* The base class for every single instance application. The #UniqueApp * The base class for every single instance application. The #UniqueApp
* structure contains only private data and should be manipulated only * structure contains only private data and should be manipulated only
* with the provided functions. * with the provided functions.
 End of changes. 3 change blocks. 
6 lines changed or deleted 0 lines changed or added


 uniqueversion.h   uniqueversion.h 
skipping to change at line 51 skipping to change at line 51
* *
* Minor version of Unique * Minor version of Unique
*/ */
#define UNIQUE_MINOR_VERSION (1) #define UNIQUE_MINOR_VERSION (1)
/** /**
* UNIQUE_MICRO_VERSION: * UNIQUE_MICRO_VERSION:
* *
* Micro version of Unique * Micro version of Unique
*/ */
#define UNIQUE_MICRO_VERSION (2) #define UNIQUE_MICRO_VERSION (4)
/** /**
* UNIQUE_VERSION_S: * UNIQUE_VERSION_S:
* *
* Unique version as a string * Unique version as a string
*/ */
#define UNIQUE_VERSION_S "1.1.2" #define UNIQUE_VERSION_S "1.1.4"
/** /**
* UNIQUE_VERSION_HEX: * UNIQUE_VERSION_HEX:
* *
* Unique version as an hexadecimal integer * Unique version as an hexadecimal integer
*/ */
#define UNIQUE_VERSION_HEX (UNIQUE_MAJOR_VERSION << 16 | \ #define UNIQUE_VERSION_HEX (UNIQUE_MAJOR_VERSION << 16 | \
UNIQUE_MINOR_VERSION << 8 | \ UNIQUE_MINOR_VERSION << 8 | \
UNIQUE_MICRO_VERSION) UNIQUE_MICRO_VERSION)
skipping to change at line 115 skipping to change at line 115
* UNIQUE_CHECK_VERSION: * UNIQUE_CHECK_VERSION:
* @major: major version, like 1 * @major: major version, like 1
* @minor: minor version, like 2 * @minor: minor version, like 2
* @micro: micro version, like 3 * @micro: micro version, like 3
* *
* Evaluates to %TRUE when the given version is higher than the version * Evaluates to %TRUE when the given version is higher than the version
* of Unique. * of Unique.
*/ */
#define UNIQUE_CHECK_VERSION(major,minor,micro) \ #define UNIQUE_CHECK_VERSION(major,minor,micro) \
((UNIQUE_MAJOR_VERSION > (major)) || \ ((UNIQUE_MAJOR_VERSION > (major)) || \
(UNIQUE_MAJOR_VERSION == (major) && UNIQUE_MICRO_VERSION > (minor) (UNIQUE_MAJOR_VERSION == (major) && UNIQUE_MINOR_VERSION > (minor)
) || \ ) || \
(UNIQUE_MAJOR_VERSION == (major) && UNIQUE_MICRO_VERSION == (minor (UNIQUE_MAJOR_VERSION == (major) && UNIQUE_MINOR_VERSION == (minor
) && UNIQUE_MICRO > (micro))) ) && UNIQUE_MICRO_VERSION > (micro)))
#endif /* __UNIQUE_VERSION_H__ */ #endif /* __UNIQUE_VERSION_H__ */
 End of changes. 3 change blocks. 
6 lines changed or deleted 6 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/