bonobo-activation-version.h | bonobo-activation-version.h | |||
---|---|---|---|---|
skipping to change at line 27 | skipping to change at line 27 | |||
* You should have received a copy of the GNU Library General Public | * You should have received a copy of the GNU Library General Public | |||
* License along with this library; if not, write to the Free | * License along with this library; if not, write to the Free | |||
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||
* | * | |||
* Author: Elliot Lee <sopwith@redhat.com> | * Author: Elliot Lee <sopwith@redhat.com> | |||
*/ | */ | |||
#ifndef BONOBO_ACTIVATION_VERSION_H | #ifndef BONOBO_ACTIVATION_VERSION_H | |||
#define BONOBO_ACTIVATION_VERSION_H | #define BONOBO_ACTIVATION_VERSION_H | |||
#define BONOBO_ACTIVATION_MAJOR_VERSION (2) | #define BONOBO_ACTIVATION_MAJOR_VERSION (2) | |||
#define BONOBO_ACTIVATION_MINOR_VERSION (23) | #define BONOBO_ACTIVATION_MINOR_VERSION (24) | |||
#define BONOBO_ACTIVATION_MICRO_VERSION (1) | #define BONOBO_ACTIVATION_MICRO_VERSION (0) | |||
#endif /* BONOBO_ACTIVATION_VERSION_H */ | #endif /* BONOBO_ACTIVATION_VERSION_H */ | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
bonobo-generic-factory.h | bonobo-generic-factory.h | |||
---|---|---|---|---|
skipping to change at line 92 | skipping to change at line 92 | |||
#endif | #endif | |||
#define BONOBO_OAF_FACTORY(oafiid, descr, version, callback, data) \ | #define BONOBO_OAF_FACTORY(oafiid, descr, version, callback, data) \ | |||
BONOBO_ACTIVATION_FACTORY(oafiid, descr, version, callback, data) | BONOBO_ACTIVATION_FACTORY(oafiid, descr, version, callback, data) | |||
#define BONOBO_OAF_FACTORY_MULTI(oafiid, descr, version, callback, data) \ | #define BONOBO_OAF_FACTORY_MULTI(oafiid, descr, version, callback, data) \ | |||
BONOBO_ACTIVATION_FACTORY(oafiid, descr, version, callback, data) | BONOBO_ACTIVATION_FACTORY(oafiid, descr, version, callback, data) | |||
#define BONOBO_ACTIVATION_FACTORY(oafiid, descr, version, callback, data) \ | #define BONOBO_ACTIVATION_FACTORY(oafiid, descr, version, callback, data) \ | |||
int main (int argc, char *argv []) \ | int main (int argc, char *argv []) \ | |||
{ \ | { \ | |||
g_thread_init (NULL); | ||||
\ | ||||
\ | ||||
BONOBO_FACTORY_INIT (descr, version, &argc, argv); \ | BONOBO_FACTORY_INIT (descr, version, &argc, argv); \ | |||
\ | \ | |||
return bonobo_generic_factory_main (oafiid, callback, data); \ | return bonobo_generic_factory_main (oafiid, callback, data); \ | |||
} | } | |||
#define BONOBO_ACTIVATION_FACTORY_TIMEOUT(oafiid, descr, version, callback, data, quit_timeout) \ | #define BONOBO_ACTIVATION_FACTORY_TIMEOUT(oafiid, descr, version, callback, data, quit_timeout) \ | |||
int main (int argc, char *argv []) \ | int main (int argc, char *argv []) \ | |||
{ \ | { \ | |||
g_thread_init (NULL); | ||||
\ | ||||
\ | ||||
BONOBO_FACTORY_INIT (descr, version, &argc, argv); \ | BONOBO_FACTORY_INIT (descr, version, &argc, argv); \ | |||
\ | \ | |||
return bonobo_generic_factory_main_timeout (oafiid, callback, data, quit_timeout); \ | return bonobo_generic_factory_main_timeout (oafiid, callback, data, quit_timeout); \ | |||
} | } | |||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 8 lines changed or added | |||