Mercurial > pidgin.yaz
comparison pidgin/gtkgaim-compat.h @ 25401:3d8c53f3108e
propagate from branch 'im.pidgin.pidgin' (head c51bf3defef588c1efb6022d502dfc38c55664b2)
to branch 'im.pidgin.pidgin.next.minor' (head 6e322d5af16add8bdb97f6896a7d8fe14c82daca)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 24 Jan 2009 03:11:09 +0000 |
parents | 17b840986607 |
children |
comparison
equal
deleted
inserted
replaced
25400:4e9f98939d32 | 25401:3d8c53f3108e |
---|---|
295 #define gaim_gtk_xfers_init pidgin_xfers_init | 295 #define gaim_gtk_xfers_init pidgin_xfers_init |
296 #define gaim_gtk_xfers_uninit pidgin_xfers_uninit | 296 #define gaim_gtk_xfers_uninit pidgin_xfers_uninit |
297 #define GAIM_HIG_BORDER PIDGIN_HIG_BORDER | 297 #define GAIM_HIG_BORDER PIDGIN_HIG_BORDER |
298 #define GAIM_HIG_BOX_SPACE PIDGIN_HIG_BOX_SPACE | 298 #define GAIM_HIG_BOX_SPACE PIDGIN_HIG_BOX_SPACE |
299 #define GAIM_HIG_CAT_SPACE PIDGIN_HIG_CAT_SPACE | 299 #define GAIM_HIG_CAT_SPACE PIDGIN_HIG_CAT_SPACE |
300 #if !GTK_CHECK_VERSION(2,16,0) | |
300 #define GAIM_INVISIBLE_CHAR PIDGIN_INVISIBLE_CHAR | 301 #define GAIM_INVISIBLE_CHAR PIDGIN_INVISIBLE_CHAR |
302 #endif /* Less than GTK+ 2.16 */ | |
301 #define GAIM_IS_GTK_CONVERSATION PIDGIN_IS_PIDGIN_CONVERSATION | 303 #define GAIM_IS_GTK_CONVERSATION PIDGIN_IS_PIDGIN_CONVERSATION |
302 #define GAIM_IS_GTK_PLUGIN PIDGIN_IS_PIDGIN_PLUGIN | 304 #define GAIM_IS_GTK_PLUGIN PIDGIN_IS_PIDGIN_PLUGIN |
303 #define gaim_new_check_item pidgin_new_check_item | 305 #define gaim_new_check_item pidgin_new_check_item |
304 #define gaim_new_item_from_stock pidgin_new_item_from_stock | 306 #define gaim_new_item_from_stock pidgin_new_item_from_stock |
305 #define gaim_new_item pidgin_new_item | 307 #define gaim_new_item pidgin_new_item |