geis.h   geis.h 
skipping to change at line 461 skipping to change at line 461
#define GEIS_INIT_SERVICE_PROVIDER "org.libgeis.init.server" #define GEIS_INIT_SERVICE_PROVIDER "org.libgeis.init.server"
#define GEIS_INIT_TRACK_DEVICES "org.libgeis.init.track-devices" #define GEIS_INIT_TRACK_DEVICES "org.libgeis.init.track-devices"
#define GEIS_INIT_TRACK_GESTURE_CLASSES "org.libgeis.init.track-gesture-cl asses" #define GEIS_INIT_TRACK_GESTURE_CLASSES "org.libgeis.init.track-gesture-cl asses"
/* @} */ /* @} */
/** /**
* @name Vendor-defined Initialization Arguments * @name Vendor-defined Initialization Arguments
* *
* @par * @par
* These initialization arguments are not a part of te GEIS specification a nd * These initialization arguments are not a part of the GEIS specification and
* may change. * may change.
* *
* @{ * @{
* *
* @def GEIS_INIT_UTOUCH_MOCK_ENGINE * @def GEIS_INIT_UTOUCH_MOCK_BACKEND
* *
* @def GEIS_INIT_UTOUCH_XCB * @def GEIS_INIT_UTOUCH_DBUS_BACKEND
*
* @def GEIS_INIT_UTOUCH_XCB_BACKEND
*/ */
#define GEIS_INIT_UTOUCH_MOCK_ENGINE "com.canonical.utouch.mock.engine" #define GEIS_INIT_UTOUCH_MOCK_BACKEND "com.canonical.utouch.backend.mock"
#define GEIS_INIT_UTOUCH_XCB "com.canonical.utouch.xcb" #define GEIS_INIT_UTOUCH_DBUS_BACKEND "com.canonical.utouch.backend.dbus"
#define GEIS_INIT_UTOUCH_XCB_BACKEND "com.canonical.utouch.backend.xcb"
/* @} */ /* @} */
/** /**
* Initializes an instance of the GEIS v2.0 API. * Initializes an instance of the GEIS v2.0 API.
* @ingroup geis_v2_geis * @ingroup geis_v2_geis
* @memberof Geis * @memberof Geis
* *
* @param[in] init_arg_name The name of an initializaer argument. * @param[in] init_arg_name The name of an initializaer argument.
* @param[in] ... The remaining initializaer arguments. * @param[in] ... The remaining initializaer arguments.
skipping to change at line 709 skipping to change at line 712
* (name, type, value) tuple. These attribute reveal a little piece of * (name, type, value) tuple. These attribute reveal a little piece of
* information about a gesture. * information about a gesture.
*/ */
typedef struct GeisGestureAttr typedef struct GeisGestureAttr
{ {
/** The name of the gesture attribute. */ /** The name of the gesture attribute. */
GeisString name; GeisString name;
/** The data type of the gesture attribute. */ /** The data type of the gesture attribute. */
GeisAttrType type; GeisAttrType type;
/** The value of the attributes. */ /** The value of the attributes. */
union __extension__ union
{ {
GeisBoolean boolean_val; GeisBoolean boolean_val;
GeisFloat float_val; GeisFloat float_val;
GeisInteger integer_val; GeisInteger integer_val;
GeisString string_val; GeisString string_val;
}; };
} GeisGestureAttr; } GeisGestureAttr;
/** /**
* A callback used for different gesture events. * A callback used for different gesture events.
skipping to change at line 1301 skipping to change at line 1304
* @param[in] gesture_class The gesture class object. * @param[in] gesture_class The gesture class object.
*/ */
GEIS_API void geis_gesture_class_ref(GeisGestureClass gesture_class); GEIS_API void geis_gesture_class_ref(GeisGestureClass gesture_class);
/** /**
* Decrements the reference count of a gesture class object. * Decrements the reference count of a gesture class object.
* @memberof GeisGestureClass * @memberof GeisGestureClass
* *
* @param[in] gesture_class The gesture class object. * @param[in] gesture_class The gesture class object.
* *
* The reference count of teh object is decremented and, if it reaches zero , the * The reference count of the object is decremented and, if it reaches zero , the
* object is destroyed. * object is destroyed.
*/ */
GEIS_API void geis_gesture_class_unref(GeisGestureClass gesture_class); GEIS_API void geis_gesture_class_unref(GeisGestureClass gesture_class);
/** /**
* Gets the name of the gesture class. * Gets the name of the gesture class.
* @memberof GeisGestureClass * @memberof GeisGestureClass
* *
* @param[in] gesture_class The gesture class object. * @param[in] gesture_class The gesture class object.
*/ */
skipping to change at line 1331 skipping to change at line 1334
/** /**
* Gets the number of attributes of the gesture class. * Gets the number of attributes of the gesture class.
* @memberof GeisGestureClass * @memberof GeisGestureClass
* *
* @param[in] gesture_class The gesture class object. * @param[in] gesture_class The gesture class object.
*/ */
GEIS_API GeisSize geis_gesture_class_attr_count(GeisGestureClass gesture_cl ass); GEIS_API GeisSize geis_gesture_class_attr_count(GeisGestureClass gesture_cl ass);
/** /**
* Gets the indicated attribute of teh gesture class. * Gets the indicated attribute of the gesture class.
* @memberof GeisGestureClass * @memberof GeisGestureClass
* *
* @param[in] gesture_class The gesture class object. * @param[in] gesture_class The gesture class object.
* @param[in] index The index of the attribute to retrieve. * @param[in] index The index of the attribute to retrieve.
*/ */
GEIS_API GeisAttr geis_gesture_class_attr(GeisGestureClass gesture_class, GEIS_API GeisAttr geis_gesture_class_attr(GeisGestureClass gesture_class,
int index); int index);
/* @} */ /* @} */
 End of changes. 7 change blocks. 
8 lines changed or deleted 11 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/