# HG changeset patch # User Stu Tomlinson # Date 1177170140 0 # Node ID ba8f039e4efce437d1abb35a81b8d0a42fcc9645 # Parent e6c33c3ca7727bbb45d604cee5fafd2a95ece705 Somehow I missed huge quantities of GtkGaim compat defines in my first pass, so here are some more. diff -r e6c33c3ca772 -r ba8f039e4efc pidgin/gtkgaim-compat.h --- a/pidgin/gtkgaim-compat.h Sat Apr 21 14:50:19 2007 +0000 +++ b/pidgin/gtkgaim-compat.h Sat Apr 21 15:42:20 2007 +0000 @@ -25,12 +25,32 @@ #ifndef _GTKGAIM_COMPAT_H_ #define _GTKGAIM_COMPAT_H_ +#define GAIM_ALERT_TITLE PIDGIN_ALERT_TITLE +#define GAIM_BROWSER_CURRENT PIDGIN_BROWSER_CURRENT +#define GAIM_BROWSER_DEFAULT PIDGIN_BROWSER_DEFAULT +#define GAIM_BROWSER_NEW_TAB PIDGIN_BROWSER_NEW_TAB +#define GAIM_BROWSER_NEW_WINDOW PIDGIN_BROWSER_NEW_WINDOW +#define GaimBrowserPlace PidginBrowserPlace +#define GAIM_BUTTON_HORIZONTAL PIDGIN_BUTTON_HORIZONTAL +#define GAIM_BUTTON_IMAGE PIDGIN_BUTTON_IMAGE +#define GAIM_BUTTON_NONE PIDGIN_BUTTON_NONE +#define GaimButtonOrientation PidginButtonOrientation +#define GaimButtonStyle PidginButtonStyle +#define GAIM_BUTTON_TEXT_IMAGE PIDGIN_BUTTON_TEXT_IMAGE +#define GAIM_BUTTON_TEXT PIDGIN_BUTTON_TEXT +#define GAIM_BUTTON_VERTICAL PIDGIN_BUTTON_VERTICAL +#define GaimConvPlacementFunc fnc #define GaimConvPlacementFunc PidginConvPlacementFunc +#define GAIM_DIALOG PIDGIN_DIALOG +#define gaim_dnd_file_manage pidgin_dnd_file_manage #define gaim_get_gtkxfer_dialog pidgin_get_xfer_dialog #define gaim_gtk_account_dialog_show pidgin_account_dialog_show #define GaimGtkAccountDialogType PidginAccountDialogType #define gaim_gtk_account_get_handle pidgin_account_get_handle #define gaim_gtk_account_init pidgin_account_init +#define gaim_gtk_account_option_menu_get_selected pidgin_account_option_menu_get_selected +#define gaim_gtk_account_option_menu_new pidgin_account_option_menu_new +#define gaim_gtk_account_option_menu_set_selected pidgin_account_option_menu_set_selected #define gaim_gtk_accounts_get_ui_ops pidgin_accounts_get_ui_ops #define gaim_gtk_accounts_window_hide pidgin_accounts_window_hide #define gaim_gtk_accounts_window_show pidgin_accounts_window_show @@ -39,6 +59,7 @@ #define gaim_gtk_append_blist_node_extended_menu pidgin_append_blist_node_extended_menu #define gaim_gtk_append_blist_node_privacy_menu pidgin_append_blist_node_privacy_menu #define gaim_gtk_append_blist_node_proto_menu pidgin_append_blist_node_proto_menu +#define gaim_gtk_append_menu_action pidgin_append_menu_action #define gaim_gtk_blist_add_alert pidgin_blist_add_alert #define gaim_gtk_blist_get_default_gtk_blist pidgin_blist_get_default_gtk_blist #define gaim_gtk_blist_get_handle pidgin_blist_get_handle @@ -50,6 +71,7 @@ #define gaim_gtk_blist_joinchat_show pidgin_blist_joinchat_show #define gaim_gtk_blist_make_buddy_menu pidgin_blist_make_buddy_menu #define gaim_gtk_blist_node_is_contact_expanded pidgin_blist_node_is_contact_expanded +#define GAIM_GTK_BLIST PIDGIN_BLIST #define gaim_gtk_blist_refresh pidgin_blist_refresh #define gaim_gtk_blist_set_headline pidgin_blist_set_headline #define gaim_gtk_blist_setup_sort_methods pidgin_blist_setup_sort_methods @@ -69,6 +91,9 @@ #define gaim_gtk_blist_update_sort_methods pidgin_blist_update_sort_methods #define gaim_gtk_blist_visibility_manager_add pidgin_blist_visibility_manager_add #define gaim_gtk_blist_visibility_manager_remove pidgin_blist_visibility_manager_remove +#define gaim_gtk_buddy_icon_chooser_new pidgin_buddy_icon_chooser_new +#define gaim_gtk_buddy_icon_get_scale_size pidgin_buddy_icon_get_scale_size +#define GaimGtkBuddyList PidginBuddyList #define GaimGtkCellRendererExpanderClass PidginCellRendererExpanderClass #define gaim_gtk_cell_renderer_expander_get_type pidgin_cell_renderer_expander_get_type #define gaim_gtk_cell_renderer_expander_new pidgin_cell_renderer_expander_new @@ -78,18 +103,21 @@ #define gaim_gtk_cell_renderer_progress_new pidgin_cell_renderer_progress_new #define GaimGtkCellRendererProgress PidginCellRendererProgress #define GaimGtkChatPane PidginChatPane -#define GaimGtkChatPane PidginChatPane +#define gaim_gtk_check_if_dir pidgin_check_if_dir +#define gaim_gtk_clear_cursor pidgin_clear_cursor #define gaim_gtk_connection_get_handle pidgin_connection_get_handle #define gaim_gtk_connection_init pidgin_connection_init #define gaim_gtk_connections_get_ui_ops pidgin_connections_get_ui_ops #define gaim_gtk_connection_uninit pidgin_connection_uninit #define GaimGtkConversation PidginConversation +#define GAIM_GTK_CONVERSATION PIDGIN_CONVERSATION #define gaim_gtk_conversations_fill_menu pidgin_conversations_fill_menu #define gaim_gtk_conversations_find_unseen_list pidgin_conversations_find_unseen_list #define gaim_gtk_conversations_get_conv_ui_ops pidgin_conversations_get_conv_ui_ops #define gaim_gtk_conversations_get_handle pidgin_conversations_get_handle #define gaim_gtk_conversations_init pidgin_conversations_init #define gaim_gtk_conversations_uninit pidgin_conversations_uninit +#define gaim_gtk_convert_buddy_icon pidgin_convert_buddy_icon #define gaim_gtkconv_get_tab_at_xy pidgin_conv_get_tab_at_xy #define gaim_gtkconv_get_tab_icon pidgin_conv_get_tab_icon #define gaim_gtkconv_get_window pidgin_conv_get_window @@ -126,6 +154,7 @@ #define gaim_gtk_conv_windows_get_list pidgin_conv_windows_get_list #define gaim_gtk_conv_window_show pidgin_conv_window_show #define gaim_gtk_conv_window_switch_gtkconv pidgin_conv_window_switch_gtkconv +#define gaim_gtk_create_imhtml pidgin_create_imhtml #define gaim_gtk_debug_get_handle pidgin_debug_get_handle #define gaim_gtk_debug_get_ui_ops pidgin_debug_get_ui_ops #define gaim_gtk_debug_init pidgin_debug_init @@ -157,29 +186,36 @@ #define gaim_gtk_eventloop_get_ui_ops pidgin_eventloop_get_ui_ops #define gaim_gtk_idle_get_ui_ops pidgin_idle_get_ui_ops #define GaimGtkImPane PidginImPane -#define GaimGtkImPane PidginImPane +#define gaim_gtk_load_accels pidgin_load_accels #define gaim_gtk_log_get_handle pidgin_log_get_handle #define gaim_gtk_log_init pidgin_log_init #define gaim_gtk_log_show_contact pidgin_log_show_contact #define gaim_gtk_log_show pidgin_log_show #define gaim_gtk_log_uninit pidgin_log_uninit #define GaimGtkLogViewer PidginLogViewer +#define gaim_gtk_make_frame pidgin_make_frame +#define gaim_gtk_make_mini_dialog pidgin_make_mini_dialog +#define gaim_gtk_make_pretty_arrows pidgin_make_pretty_arrows #define gaim_gtk_menu_tray_append pidgin_menu_tray_append #define GaimGtkMenuTrayClass PidginMenuTrayClass #define gaim_gtk_menu_tray_get_box pidgin_menu_tray_get_box #define gaim_gtk_menu_tray_get_gtype pidgin_menu_tray_get_gtype +#define GAIM_GTK_MENU_TRAY_H PIDGIN_MENU_TRAY_H #define gaim_gtk_menu_tray_new pidgin_menu_tray_new #define GaimGtkMenuTray PidginMenuTray -#define GaimGtkMenuTray PidginMenuTray #define gaim_gtk_menu_tray_prepend pidgin_menu_tray_prepend #define gaim_gtk_menu_tray_set_tooltip pidgin_menu_tray_set_tooltip #define GAIM_GTK_MODIFY_ACCOUNT_DIALOG PIDGIN_MODIFY_ACCOUNT_DIALOG #define gaim_gtk_notify_get_ui_ops pidgin_notify_get_ui_ops +#define gaim_gtk_parse_x_im_contact pidgin_parse_x_im_contact #define gaim_gtk_plugin_dialog_show pidgin_plugin_dialog_show #define gaim_gtk_plugin_get_config_frame pidgin_plugin_get_config_frame +#define GAIM_GTK_PLUGIN PIDGIN_PLUGIN #define gaim_gtk_plugin_pref_create_frame pidgin_plugin_pref_create_frame #define gaim_gtk_plugins_save pidgin_plugins_save +#define GAIM_GTK_PLUGIN_TYPE PIDGIN_PLUGIN_TYPE #define GaimGtkPluginUiInfo PidginPluginUiInfo +#define GAIM_GTK_PLUGIN_UI_INFO PIDGIN_PLUGIN_UI_INFO #define gaim_gtk_pounce_editor_show pidgin_pounce_editor_show #define gaim_gtk_pounces_get_handle pidgin_pounces_get_handle #define gaim_gtk_pounces_init pidgin_pounces_init @@ -197,6 +233,7 @@ #define gaim_gtk_privacy_dialog_show pidgin_privacy_dialog_show #define gaim_gtk_privacy_get_ui_ops pidgin_privacy_get_ui_ops #define gaim_gtk_privacy_init pidgin_privacy_init +#define gaim_gtk_protocol_option_menu_new pidgin_protocol_option_menu_new #define gaim_gtk_request_add_block pidgin_request_add_block #define gaim_gtk_request_add_permit pidgin_request_add_permit #define gaim_gtk_request_get_ui_ops pidgin_request_get_ui_ops @@ -204,8 +241,16 @@ #define gaim_gtk_roomlist_dialog_show_with_account pidgin_roomlist_dialog_show_with_account #define gaim_gtk_roomlist_init pidgin_roomlist_init #define gaim_gtk_roomlist_is_showable pidgin_roomlist_is_showable +#define gaim_gtk_save_accels_cb pidgin_save_accels_cb +#define gaim_gtk_save_accels pidgin_save_accels #define gaim_gtk_session_end pidgin_session_end #define gaim_gtk_session_init pidgin_session_init +#define gaim_gtk_set_cursor pidgin_set_cursor +#define gaim_gtk_set_custom_buddy_icon pidgin_set_custom_buddy_icon +#define gaim_gtk_set_sensitive_if_input pidgin_set_sensitive_if_input +#define gaim_gtk_setup_gtkspell pidgin_setup_gtkspell +#define gaim_gtk_setup_screenname_autocomplete pidgin_setup_screenname_autocomplete +#define gaim_gtk_set_urgent pidgin_set_urgent #define gaim_gtk_sound_get_event_label pidgin_sound_get_event_label #define gaim_gtk_sound_get_event_option pidgin_sound_get_event_option #define gaim_gtk_sound_get_handle pidgin_sound_get_handle @@ -225,7 +270,15 @@ #define gaim_gtkthemes_smileys_disabled pidgin_themes_smileys_disabled #define gaim_gtkthemes_smiley_themeize pidgin_themes_smiley_themeize #define gaim_gtkthemes_smiley_theme_probe pidgin_themes_smiley_theme_probe +#define gaim_gtk_toggle_sensitive_array pidgin_toggle_sensitive_array +#define gaim_gtk_toggle_sensitive pidgin_toggle_sensitive +#define gaim_gtk_toggle_showhide pidgin_toggle_showhide +#define gaim_gtk_treeview_popup_menu_position_func pidgin_treeview_popup_menu_position_func +#define gaim_gtk_tree_view_search_equal_func pidgin_tree_view_search_equal_func +#define GAIM_GTK_TYPE_MENU_TRAY PIDGIN_TYPE_MENU_TRAY +#define GAIM_GTK_UI PIDGIN_UI #define gaim_gtk_whiteboard_get_ui_ops pidgin_whiteboard_get_ui_ops +#define GaimGtkWhiteboard PidginWhiteboard #define GaimGtkWindow PidginWindow #define gaim_gtkxfer_dialog_add_xfer pidgin_xfer_dialog_add_xfer #define gaim_gtkxfer_dialog_cancel_xfer pidgin_xfer_dialog_cancel_xfer @@ -239,17 +292,30 @@ #define gaim_gtk_xfers_get_ui_ops pidgin_xfers_get_ui_ops #define gaim_gtk_xfers_init pidgin_xfers_init #define gaim_gtk_xfers_uninit pidgin_xfers_uninit +#define GAIM_HIG_BORDER PIDGIN_HIG_BORDER +#define GAIM_HIG_BOX_SPACE PIDGIN_HIG_BOX_SPACE +#define GAIM_HIG_CAT_SPACE PIDGIN_HIG_CAT_SPACE +#define GAIM_INVISIBLE_CHAR PIDGIN_INVISIBLE_CHAR +#define gaim_new_check_item pidgin_new_check_item +#define gaim_new_item_from_stock pidgin_new_item_from_stock +#define gaim_new_item pidgin_new_item +#define gaim_pixbuf_button_from_stock pidgin_pixbuf_button_from_stock +#define gaim_pixbuf_toolbar_button_from_stock pidgin_pixbuf_toolbar_button_from_stock #define GaimScrollBookClass PidginScrollBookClass #define gaim_scroll_book_get_type pidgin_scroll_book_get_type #define gaim_scroll_book_new pidgin_scroll_book_new #define GaimScrollBook PidginScrollBook +#define gaim_separator pidgin_separator +#define gaim_set_accessible_label pidgin_set_accessible_label #define gaim_set_gtkxfer_dialog pidgin_set_xfer_dialog +#define gaim_setup_imhtml pidgin_setup_imhtml #define gaim_status_box_add pidgin_status_box_add #define gaim_status_box_add_separator pidgin_status_box_add_separator #define GaimStatusBoxClass PidginStatusBoxClass #define gaim_status_box_get_buddy_icon pidgin_status_box_get_buddy_icon #define gaim_status_box_get_message pidgin_status_box_get_message #define gaim_status_box_get_type pidgin_status_box_get_type +#define GaimStatusBoxItemType PidginStatusBoxItemType #define gaim_status_box_new pidgin_status_box_new #define gaim_status_box_new_with_account pidgin_status_box_new_with_account #define GAIM_STATUS_BOX_NUM_TYPES PIDGIN_STATUS_BOX_NUM_TYPES @@ -266,12 +332,62 @@ #define GAIM_STATUS_ICON_LARGE PIDGIN_STATUS_ICON_LARGE #define GaimStatusIconSize PidginStatusIconSize #define GAIM_STATUS_ICON_SMALL PIDGIN_STATUS_ICON_SMALL +#define GAIM_STOCK_ABOUT PIDGIN_STOCK_ABOUT +#define GAIM_STOCK_ACTION PIDGIN_STOCK_ACTION +#define GAIM_STOCK_ALIAS PIDGIN_STOCK_ALIAS +#define GAIM_STOCK_AWAY PIDGIN_STOCK_AWAY +#define GAIM_STOCK_CHAT PIDGIN_STOCK_CHAT +#define GAIM_STOCK_CLEAR PIDGIN_STOCK_CLEAR +#define GAIM_STOCK_CLOSE_TABS PIDGIN_STOCK_CLOSE_TABS +#define GAIM_STOCK_DEBUG PIDGIN_STOCK_DEBUG +#define GAIM_STOCK_DIALOG_AUTH PIDGIN_STOCK_DIALOG_AUTH +#define GAIM_STOCK_DIALOG_COOL PIDGIN_STOCK_DIALOG_COOL +#define GAIM_STOCK_DIALOG_ERROR PIDGIN_STOCK_DIALOG_ERROR +#define GAIM_STOCK_DIALOG_INFO PIDGIN_STOCK_DIALOG_INFO +#define GAIM_STOCK_DIALOG_QUESTION PIDGIN_STOCK_DIALOG_QUESTION +#define GAIM_STOCK_DIALOG_WARNING PIDGIN_STOCK_DIALOG_WARNING +#define GAIM_STOCK_DISCONNECT PIDGIN_STOCK_DISCONNECT +#define GAIM_STOCK_DOWNLOAD PIDGIN_STOCK_DOWNLOAD +#define GAIM_STOCK_EDIT PIDGIN_STOCK_EDIT +#define GAIM_STOCK_FGCOLOR PIDGIN_STOCK_FGCOLOR +#define GAIM_STOCK_FILE_CANCELED PIDGIN_STOCK_FILE_CANCELED +#define GAIM_STOCK_FILE_DONE PIDGIN_STOCK_FILE_DONE +#define GAIM_STOCK_FILE_TRANSFER PIDGIN_STOCK_FILE_TRANSFER +#define GAIM_STOCK_IGNORE PIDGIN_STOCK_IGNORE +#define GAIM_STOCK_INVITE PIDGIN_STOCK_INVITE +#define GAIM_STOCK_MODIFY PIDGIN_STOCK_MODIFY +#define GAIM_STOCK_OPEN_MAIL PIDGIN_STOCK_OPEN_MAIL +#define GAIM_STOCK_PAUSE PIDGIN_STOCK_PAUSE +#define GAIM_STOCK_POUNCE PIDGIN_STOCK_POUNCE +#define GAIM_STOCK_SIGN_OFF PIDGIN_STOCK_SIGN_OFF +#define GAIM_STOCK_SIGN_ON PIDGIN_STOCK_SIGN_ON +#define GAIM_STOCK_STATUS_OFFLINE PIDGIN_STOCK_STATUS_OFFLINE +#define GAIM_STOCK_TEXT_NORMAL PIDGIN_STOCK_TEXT_NORMAL +#define GAIM_STOCK_TYPED PIDGIN_STOCK_TYPED +#define GAIM_STOCK_UPLOAD PIDGIN_STOCK_UPLOAD +#define GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER +#define GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS +#define GAIM_TYPE_SCROLL_BOOK PIDGIN_TYPE_SCROLL_BOOK +#define GAIM_TYPE_STATUS_BOX PIDGIN_TYPE_STATUS_BOX #define GAIM_UNSEEN_EVENT PIDGIN_UNSEEN_EVENT #define GAIM_UNSEEN_NICK PIDGIN_UNSEEN_NICK #define GAIM_UNSEEN_NO_LOG PIDGIN_UNSEEN_NO_LOG #define GAIM_UNSEEN_NONE PIDGIN_UNSEEN_NONE #define GaimUnseenState PidginUnseenState #define GAIM_UNSEEN_TEXT PIDGIN_UNSEEN_TEXT +#define GAIM_WINDOW_ICONIFIED ->window +#define gtk_gaim_scroll_book_get_type pidgin_scroll_book_get_type +#define gtk_gaim_scroll_book_new pidgin_scroll_book_new +#define gtk_gaim_status_box_add_separator pidgin_status_box_add_separator +#define gtk_gaim_status_box_get_buddy_icon pidgin_status_box_get_buddy_icon +#define gtk_gaim_status_box_get_message pidgin_status_box_get_message +#define gtk_gaim_status_box_get_type pidgin_status_box_get_type #define GtkGaimStatusBoxItemType PidginStatusBoxItemType +#define gtk_gaim_status_box_new pidgin_status_box_new +#define gtk_gaim_status_box_new_with_account pidgin_status_box_new_with_account +#define gtk_gaim_status_box_pulse_connecting pidgin_status_box_pulse_connecting +#define gtk_gaim_status_box_set_buddy_icon pidgin_status_box_set_buddy_icon +#define gtk_gaim_status_box_set_connecting pidgin_status_box_set_connecting +#define gtk_gaim_status_box_set_network_available pidgin_status_box_set_network_available #endif /* _GTKGAIM_COMPAT_H */