diff options
59 files changed, 348 insertions, 348 deletions
diff --git a/pidgin/gaimstock.c b/pidgin/gaimstock.c index 6e28894f58..d06d0042de 100644 --- a/pidgin/gaimstock.c +++ b/pidgin/gaimstock.c @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gaimstock.h" diff --git a/pidgin/gaimstock.h b/pidgin/gaimstock.h index dbd0714edd..71fcab8538 100644 --- a/pidgin/gaimstock.h +++ b/pidgin/gaimstock.h @@ -31,56 +31,56 @@ /** @name Stock images */ /**************************************************************************/ /*@{*/ -#define PIDGIN_STOCK_ABOUT "gaim-about" -#define PIDGIN_STOCK_ACCOUNTS "gaim-accounts" -#define PIDGIN_STOCK_ACTION "gaim-action" -#define PIDGIN_STOCK_ALIAS "gaim-alias" -#define PIDGIN_STOCK_AWAY "gaim-away" -#define PIDGIN_STOCK_BGCOLOR "gaim-bgcolor" -#define PIDGIN_STOCK_BLOCK "gaim-block" -#define PIDGIN_STOCK_UNBLOCK "gaim-unblock" -#define PIDGIN_STOCK_CHAT "gaim-chat" -#define PIDGIN_STOCK_CLEAR "gaim-clear" -#define PIDGIN_STOCK_CLOSE_TABS "gaim-close-tab" -#define PIDGIN_STOCK_CONNECT "gaim-connect" -#define PIDGIN_STOCK_DEBUG "gaim-debug" -#define PIDGIN_STOCK_DISCONNECT "gaim-disconnect" -#define PIDGIN_STOCK_DOWNLOAD "gaim-download" -#define PIDGIN_STOCK_EDIT "gaim-edit" -#define PIDGIN_STOCK_FGCOLOR "gaim-fgcolor" -#define PIDGIN_STOCK_FILE_CANCELED "gaim-file-canceled" -#define PIDGIN_STOCK_FILE_DONE "gaim-file-done" -#define PIDGIN_STOCK_FILE_TRANSFER "gaim-file-transfer" -#define PIDGIN_STOCK_ICON_AWAY "gaim-icon-away" -#define PIDGIN_STOCK_ICON_AWAY_MSG "gaim-icon-away-msg" -#define PIDGIN_STOCK_ICON_CONNECT "gaim-icon-away-connect" -#define PIDGIN_STOCK_ICON_OFFLINE "gaim-icon-offline" -#define PIDGIN_STOCK_ICON_ONLINE "gaim-icon-online" -#define PIDGIN_STOCK_ICON_ONLINE_MSG "gaim-icon-online-msg" -#define PIDGIN_STOCK_IGNORE "gaim-ignore" -#define PIDGIN_STOCK_IM "gaim-im" -#define PIDGIN_STOCK_IMAGE "gaim-image" -#define PIDGIN_STOCK_INFO "gaim-info" -#define PIDGIN_STOCK_INVITE "gaim-invite" -#define PIDGIN_STOCK_LINK "gaim-link" -#define PIDGIN_STOCK_LOG "gaim-log" -#define PIDGIN_STOCK_MODIFY "gaim-modify" -#define PIDGIN_STOCK_OPEN_MAIL "gaim-stock-open-mail" -#define PIDGIN_STOCK_PAUSE "gaim-pause" -#define PIDGIN_STOCK_PENDING "gaim-pending" -#define PIDGIN_STOCK_PLUGIN "gaim-plugin" -#define PIDGIN_STOCK_POUNCE "gaim-pounce" -#define PIDGIN_STOCK_SEND "gaim-send" -#define PIDGIN_STOCK_SIGN_OFF "gaim-sign-off" -#define PIDGIN_STOCK_SIGN_ON "gaim-sign-on" -#define PIDGIN_STOCK_SMILEY "gaim-smiley" -#define PIDGIN_STOCK_TEXT_BIGGER "gaim-text-bigger" -#define PIDGIN_STOCK_TEXT_NORMAL "gaim-text-normal" -#define PIDGIN_STOCK_TEXT_SMALLER "gaim-text-smaller" -#define PIDGIN_STOCK_TYPED "gaim-typed" -#define PIDGIN_STOCK_TYPING "gaim-typing" -#define PIDGIN_STOCK_UPLOAD "gaim-upload" -#define PIDGIN_STOCK_VOICE_CHAT "gaim-voice-chat" +#define PIDGIN_STOCK_ABOUT "pidgin-about" +#define PIDGIN_STOCK_ACCOUNTS "pidgin-accounts" +#define PIDGIN_STOCK_ACTION "pidgin-action" +#define PIDGIN_STOCK_ALIAS "pidgin-alias" +#define PIDGIN_STOCK_AWAY "pidgin-away" +#define PIDGIN_STOCK_BGCOLOR "pidgin-bgcolor" +#define PIDGIN_STOCK_BLOCK "pidgin-block" +#define PIDGIN_STOCK_UNBLOCK "pidgin-unblock" +#define PIDGIN_STOCK_CHAT "pidgin-chat" +#define PIDGIN_STOCK_CLEAR "pidgin-clear" +#define PIDGIN_STOCK_CLOSE_TABS "pidgin-close-tab" +#define PIDGIN_STOCK_CONNECT "pidgin-connect" +#define PIDGIN_STOCK_DEBUG "pidgin-debug" +#define PIDGIN_STOCK_DISCONNECT "pidgin-disconnect" +#define PIDGIN_STOCK_DOWNLOAD "pidgin-download" +#define PIDGIN_STOCK_EDIT "pidgin-edit" +#define PIDGIN_STOCK_FGCOLOR "pidgin-fgcolor" +#define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-canceled" +#define PIDGIN_STOCK_FILE_DONE "pidgin-file-done" +#define PIDGIN_STOCK_FILE_TRANSFER "pidgin-file-transfer" +#define PIDGIN_STOCK_ICON_AWAY "pidgin-icon-away" +#define PIDGIN_STOCK_ICON_AWAY_MSG "pidgin-icon-away-msg" +#define PIDGIN_STOCK_ICON_CONNECT "pidgin-icon-away-connect" +#define PIDGIN_STOCK_ICON_OFFLINE "pidgin-icon-offline" +#define PIDGIN_STOCK_ICON_ONLINE "pidgin-icon-online" +#define PIDGIN_STOCK_ICON_ONLINE_MSG "pidgin-icon-online-msg" +#define PIDGIN_STOCK_IGNORE "pidgin-ignore" +#define PIDGIN_STOCK_IM "pidgin-im" +#define PIDGIN_STOCK_IMAGE "pidgin-image" +#define PIDGIN_STOCK_INFO "pidgin-info" +#define PIDGIN_STOCK_INVITE "pidgin-invite" +#define PIDGIN_STOCK_LINK "pidgin-link" +#define PIDGIN_STOCK_LOG "pidgin-log" +#define PIDGIN_STOCK_MODIFY "pidgin-modify" +#define PIDGIN_STOCK_OPEN_MAIL "pidgin-stock-open-mail" +#define PIDGIN_STOCK_PAUSE "pidgin-pause" +#define PIDGIN_STOCK_PENDING "pidgin-pending" +#define PIDGIN_STOCK_PLUGIN "pidgin-plugin" +#define PIDGIN_STOCK_POUNCE "pidgin-pounce" +#define PIDGIN_STOCK_SEND "pidgin-send" +#define PIDGIN_STOCK_SIGN_OFF "pidgin-sign-off" +#define PIDGIN_STOCK_SIGN_ON "pidgin-sign-on" +#define PIDGIN_STOCK_SMILEY "pidgin-smiley" +#define PIDGIN_STOCK_TEXT_BIGGER "pidgin-text-bigger" +#define PIDGIN_STOCK_TEXT_NORMAL "pidgin-text-normal" +#define PIDGIN_STOCK_TEXT_SMALLER "pidgin-text-smaller" +#define PIDGIN_STOCK_TYPED "pidgin-typed" +#define PIDGIN_STOCK_TYPING "pidgin-typing" +#define PIDGIN_STOCK_UPLOAD "pidgin-upload" +#define PIDGIN_STOCK_VOICE_CHAT "pidgin-voice-chat" /* Status icons */ #define PIDGIN_STOCK_STATUS_AVAILABLE "pidgin-status-available" diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c index 9f6ab72ecb..96c69e9757 100644 --- a/pidgin/gtkaccount.c +++ b/pidgin/gtkaccount.c @@ -24,7 +24,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "accountopt.h" diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c index 21e9e598ff..b3fcff1553 100644 --- a/pidgin/gtkblist.c +++ b/pidgin/gtkblist.c @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "connection.h" @@ -4331,7 +4331,7 @@ static void pidgin_blist_show(GaimBuddyList *list) sep = gtk_hseparator_new(); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sep, FALSE, FALSE, 0); - gtkblist->scrollbook = gtk_gaim_scroll_book_new(); + gtkblist->scrollbook = pidgin_scroll_book_new(); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->scrollbook, FALSE, FALSE, 0); /* Create an empty vbox used for showing connection errors */ @@ -4339,7 +4339,7 @@ static void pidgin_blist_show(GaimBuddyList *list) gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->error_buttons, FALSE, FALSE, 0); /* Add the statusbox */ - gtkblist->statusbox = gtk_gaim_status_box_new(); + gtkblist->statusbox = pidgin_status_box_new(); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0); gtk_widget_set_name(gtkblist->statusbox, "pidginblist_statusbox"); gtk_container_set_border_width(GTK_CONTAINER(gtkblist->statusbox), 3); diff --git a/pidgin/gtkblist.h b/pidgin/gtkblist.h index 9405a534f3..deeab455d3 100644 --- a/pidgin/gtkblist.h +++ b/pidgin/gtkblist.h @@ -52,7 +52,7 @@ typedef enum { } PidginStatusIconSize; -#include "gtkgaim.h" +#include "pidgin.h" #include "blist.h" /************************************************************************** diff --git a/pidgin/gtkconn.c b/pidgin/gtkconn.c index 450dadcdfb..2b3c6f1059 100644 --- a/pidgin/gtkconn.c +++ b/pidgin/gtkconn.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "debug.h" @@ -61,9 +61,9 @@ pidgin_connection_connect_progress(GaimConnection *gc, PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist(); if (!gtkblist) return; - gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox), + pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox), (gaim_connections_get_connecting() != NULL)); - gtk_gaim_status_box_pulse_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox)); + pidgin_status_box_pulse_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox)); } static void @@ -76,7 +76,7 @@ pidgin_connection_connected(GaimConnection *gc) gtkblist = pidgin_blist_get_default_gtk_blist(); if (gtkblist != NULL) - gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox), + pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox), (gaim_connections_get_connecting() != NULL)); g_hash_table_remove(hash, account); @@ -90,7 +90,7 @@ pidgin_connection_disconnected(GaimConnection *gc) PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist(); if (!gtkblist) return; - gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox), + pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox), (gaim_connections_get_connecting() != NULL)); if (gaim_connections_get_all() != NULL) @@ -199,7 +199,7 @@ static void pidgin_connection_network_connected () PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist(); if(gtkblist) - gtk_gaim_status_box_set_network_available(GTK_GAIM_STATUS_BOX(gtkblist->statusbox), TRUE); + pidgin_status_box_set_network_available(PIDGIN_STATUS_BOX(gtkblist->statusbox), TRUE); while (list) { GaimAccount *account = (GaimAccount*)list->data; @@ -218,7 +218,7 @@ static void pidgin_connection_network_disconnected () GaimConnection *gc = NULL; if(gtkblist) - gtk_gaim_status_box_set_network_available(GTK_GAIM_STATUS_BOX(gtkblist->statusbox), FALSE); + pidgin_status_box_set_network_available(PIDGIN_STATUS_BOX(gtkblist->statusbox), FALSE); while (l) { GaimAccount *a = (GaimAccount*)l->data; diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index 8b5a078b71..47a6f95f50 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #ifndef _WIN32 # include <X11/Xlib.h> @@ -6973,7 +6973,7 @@ pidgin_conversations_uninit(void) * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include <gdk/gdkkeysyms.h> diff --git a/pidgin/gtkconv.h b/pidgin/gtkconv.h index a913c92fc3..30f134d1ba 100644 --- a/pidgin/gtkconv.h +++ b/pidgin/gtkconv.h @@ -59,7 +59,7 @@ enum { (gaim_conversation_get_ui_ops(conv) == \ pidgin_conversations_get_conv_ui_ops()) -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "gtkconvwin.h" diff --git a/pidgin/gtkdebug.c b/pidgin/gtkdebug.c index fc45fa4bd5..9f200c8c66 100644 --- a/pidgin/gtkdebug.c +++ b/pidgin/gtkdebug.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "notify.h" #include "prefs.h" diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c index f286435a8d..9999d10f4d 100644 --- a/pidgin/gtkdialogs.c +++ b/pidgin/gtkdialogs.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "notify.h" diff --git a/pidgin/gtkdialogs.h b/pidgin/gtkdialogs.h index 840d6d55d5..779c4c29d5 100644 --- a/pidgin/gtkdialogs.h +++ b/pidgin/gtkdialogs.h @@ -24,7 +24,7 @@ #ifndef _PIDGINDIALOGS_H_ #define _PIDGINDIALOGS_H_ -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "conversation.h" diff --git a/pidgin/gtkdocklet-x11.c b/pidgin/gtkdocklet-x11.c index 2ab24ca05a..549476c831 100644 --- a/pidgin/gtkdocklet-x11.c +++ b/pidgin/gtkdocklet-x11.c @@ -23,7 +23,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "gaimstock.h" diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c index d04f2374a4..e17c69399f 100644 --- a/pidgin/gtkdocklet.c +++ b/pidgin/gtkdocklet.c @@ -22,7 +22,7 @@ * 02111-1307, USA. */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "core.h" #include "conversation.h" diff --git a/pidgin/gtkft.c b/pidgin/gtkft.c index d6b3e87659..03c4bd202b 100644 --- a/pidgin/gtkft.c +++ b/pidgin/gtkft.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "notify.h" diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c index 0ccfcc5713..b89960c687 100644 --- a/pidgin/gtkimhtml.c +++ b/pidgin/gtkimhtml.c @@ -63,7 +63,7 @@ #include <pango/pango-font.h> -/* GTK+ < 2.4.x hack, see gtkgaim.h for details. */ +/* GTK+ < 2.4.x hack, see pidgin.h for details. */ #if (!GTK_CHECK_VERSION(2,4,0)) #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD #endif diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c index 9ba5b32f1f..ec218ec60e 100644 --- a/pidgin/gtkimhtmltoolbar.c +++ b/pidgin/gtkimhtmltoolbar.c @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "imgstore.h" #include "notify.h" diff --git a/pidgin/gtklog.c b/pidgin/gtklog.c index 0f58d5c063..bc571f534e 100644 --- a/pidgin/gtklog.c +++ b/pidgin/gtklog.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "gtkblist.h" diff --git a/pidgin/gtklog.h b/pidgin/gtklog.h index e9792350c7..f19d40437d 100644 --- a/pidgin/gtklog.h +++ b/pidgin/gtklog.h @@ -25,7 +25,7 @@ #ifndef _PIDGINLOG_H_ #define _PIDGINLOG_H_ -#include "gtkgaim.h" +#include "pidgin.h" #include "log.h" #include "account.h" diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c index 7749a22207..be69953aa9 100644 --- a/pidgin/gtkmain.c +++ b/pidgin/gtkmain.c @@ -22,7 +22,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "conversation.h" diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c index 6dd71ad9b8..f596b3a4a3 100644 --- a/pidgin/gtknotify.c +++ b/pidgin/gtknotify.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include <gdk/gdkkeysyms.h> diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c index 25a759fd11..07b02471b0 100644 --- a/pidgin/gtkplugin.c +++ b/pidgin/gtkplugin.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkplugin.h" #include "gtkpluginpref.h" #include "gtkutils.h" diff --git a/pidgin/gtkplugin.h b/pidgin/gtkplugin.h index d64111d404..ad1c6cb2ac 100644 --- a/pidgin/gtkplugin.h +++ b/pidgin/gtkplugin.h @@ -25,7 +25,7 @@ #ifndef _PIDGINPLUGIN_H_ #define _PIDGINPLUGIN_H_ -#include "gtkgaim.h" +#include "pidgin.h" #include "plugin.h" typedef struct _PidginPluginUiInfo PidginPluginUiInfo; diff --git a/pidgin/gtkpluginpref.h b/pidgin/gtkpluginpref.h index a4ba8edfb9..03f60e82fa 100644 --- a/pidgin/gtkpluginpref.h +++ b/pidgin/gtkpluginpref.h @@ -28,7 +28,7 @@ #include "pluginpref.h" -#include "gtkgaim.h" +#include "pidgin.h" #ifdef __cplusplus extern "C" { diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c index 2c667a42f7..f3b9b262db 100644 --- a/pidgin/gtkpounce.c +++ b/pidgin/gtkpounce.c @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "conversation.h" diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c index 1aaa2cd371..3aaa9f0aa9 100644 --- a/pidgin/gtkprefs.c +++ b/pidgin/gtkprefs.c @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "notify.h" diff --git a/pidgin/gtkprivacy.c b/pidgin/gtkprivacy.c index e3257b1c40..ebb4305016 100644 --- a/pidgin/gtkprivacy.c +++ b/pidgin/gtkprivacy.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "connection.h" #include "debug.h" diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c index d8f9ed5af8..e2ed9a48db 100644 --- a/pidgin/gtkrequest.c +++ b/pidgin/gtkrequest.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "prefs.h" #include "util.h" diff --git a/pidgin/gtkroomlist.c b/pidgin/gtkroomlist.c index ad78d425a0..7114196aa9 100644 --- a/pidgin/gtkroomlist.c +++ b/pidgin/gtkroomlist.c @@ -24,7 +24,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "gaimstock.h" #include "debug.h" diff --git a/pidgin/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c index 0cfb3b6136..9848bfd4ff 100644 --- a/pidgin/gtksavedstatuses.c +++ b/pidgin/gtksavedstatuses.c @@ -33,7 +33,7 @@ #include "gtkblist.h" #include "gtkexpander.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkimhtml.h" #include "gtkimhtmltoolbar.h" #include "gtksavedstatuses.h" @@ -1701,7 +1701,7 @@ GtkWidget *pidgin_status_menu(GaimSavedStatus *current_status, GCallback callbac /* Overlay a disk in the bottom left corner */ emblem = gtk_widget_render_icon(GTK_WIDGET(combobox), - GTK_STOCK_SAVE, GTK_ICON_SIZE_MENU, "GtkGaimStatusMenu"); + GTK_STOCK_SAVE, GTK_ICON_SIZE_MENU, "PidginStatusMenu"); if (emblem != NULL) { int width = gdk_pixbuf_get_width(pixbuf) / 2; diff --git a/pidgin/gtkscrollbook.c b/pidgin/gtkscrollbook.c index d6455a5c6f..515ac1c142 100644 --- a/pidgin/gtkscrollbook.c +++ b/pidgin/gtkscrollbook.c @@ -26,15 +26,15 @@ #include "gtkscrollbook.h" -static void gtk_gaim_scroll_book_init (GtkGaimScrollBook *scroll_book); -static void gtk_gaim_scroll_book_class_init (GtkGaimScrollBookClass *klass); -static void gtk_gaim_scroll_book_forall (GtkContainer *c, +static void pidgin_scroll_book_init (PidginScrollBook *scroll_book); +static void pidgin_scroll_book_class_init (PidginScrollBookClass *klass); +static void pidgin_scroll_book_forall (GtkContainer *c, gboolean include_internals, GtkCallback callback, gpointer user_data); GType -gtk_gaim_scroll_book_get_type (void) +pidgin_scroll_book_get_type (void) { static GType scroll_book_type = 0; @@ -42,20 +42,20 @@ gtk_gaim_scroll_book_get_type (void) { static const GTypeInfo scroll_book_info = { - sizeof (GtkGaimScrollBookClass), + sizeof (PidginScrollBookClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) gtk_gaim_scroll_book_class_init, + (GClassInitFunc) pidgin_scroll_book_class_init, NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (GtkGaimScrollBook), + sizeof (PidginScrollBook), 0, - (GInstanceInitFunc) gtk_gaim_scroll_book_init, + (GInstanceInitFunc) pidgin_scroll_book_init, NULL /* value_table */ }; scroll_book_type = g_type_register_static(GTK_TYPE_VBOX, - "GtkGaimScrollBook", + "PidginScrollBook", &scroll_book_info, 0); } @@ -64,7 +64,7 @@ gtk_gaim_scroll_book_get_type (void) } static void -scroll_left_cb(GtkGaimScrollBook *scroll_book) +scroll_left_cb(PidginScrollBook *scroll_book) { int index; index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)); @@ -74,7 +74,7 @@ scroll_left_cb(GtkGaimScrollBook *scroll_book) } static void -scroll_right_cb(GtkGaimScrollBook *scroll_book) +scroll_right_cb(PidginScrollBook *scroll_book) { int index, count; index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)); @@ -89,7 +89,7 @@ scroll_right_cb(GtkGaimScrollBook *scroll_book) } static void -refresh_scroll_box(GtkGaimScrollBook *scroll_book, int index, int count) +refresh_scroll_box(PidginScrollBook *scroll_book, int index, int count) { char *label; gtk_widget_show_all(GTK_WIDGET(scroll_book)); @@ -117,7 +117,7 @@ refresh_scroll_box(GtkGaimScrollBook *scroll_book, int index, int count) static void -page_count_change_cb(GtkGaimScrollBook *scroll_book) +page_count_change_cb(PidginScrollBook *scroll_book) { int count; int index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook)); @@ -131,7 +131,7 @@ page_count_change_cb(GtkGaimScrollBook *scroll_book) } static void -switch_page_cb(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, GtkGaimScrollBook *scroll_book) +switch_page_cb(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, PidginScrollBook *scroll_book) { int count; #if GTK_CHECK_VERSION(2,2,0) @@ -143,37 +143,37 @@ switch_page_cb(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, Gtk } static void -gtk_gaim_scroll_book_add(GtkContainer *container, GtkWidget *widget) +pidgin_scroll_book_add(GtkContainer *container, GtkWidget *widget) { gtk_widget_show(widget); - gtk_notebook_append_page(GTK_NOTEBOOK(GTK_GAIM_SCROLL_BOOK(container)->notebook), widget, NULL); - page_count_change_cb(GTK_GAIM_SCROLL_BOOK(container)); + gtk_notebook_append_page(GTK_NOTEBOOK(PIDGIN_SCROLL_BOOK(container)->notebook), widget, NULL); + page_count_change_cb(PIDGIN_SCROLL_BOOK(container)); } static void -gtk_gaim_scroll_book_forall(GtkContainer *container, +pidgin_scroll_book_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data) { - GtkGaimScrollBook *scroll_book = GTK_GAIM_SCROLL_BOOK(container); + PidginScrollBook *scroll_book = PIDGIN_SCROLL_BOOK(container); if (include_internals) (*callback)(scroll_book->hbox, callback_data); (*callback)(scroll_book->notebook, callback_data); } static void -gtk_gaim_scroll_book_class_init (GtkGaimScrollBookClass *klass) +pidgin_scroll_book_class_init (PidginScrollBookClass *klass) { GtkContainerClass *container_class = (GtkContainerClass*)klass; - container_class->add = gtk_gaim_scroll_book_add; - container_class->forall = gtk_gaim_scroll_book_forall; + container_class->add = pidgin_scroll_book_add; + container_class->forall = pidgin_scroll_book_forall; } static void -gtk_gaim_scroll_book_init (GtkGaimScrollBook *scroll_book) +pidgin_scroll_book_init (PidginScrollBook *scroll_book) { GtkWidget *eb; @@ -210,7 +210,7 @@ gtk_gaim_scroll_book_init (GtkGaimScrollBook *scroll_book) GtkWidget * -gtk_gaim_scroll_book_new() +pidgin_scroll_book_new() { - return g_object_new(GTK_GAIM_TYPE_SCROLL_BOOK, NULL); + return g_object_new(PIDGIN_TYPE_SCROLL_BOOK, NULL); } diff --git a/pidgin/gtkscrollbook.h b/pidgin/gtkscrollbook.h index d40d6954df..2618f7024f 100644 --- a/pidgin/gtkscrollbook.h +++ b/pidgin/gtkscrollbook.h @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __GTK_GAIM_SCROLL_BOOK_H__ -#define __GTK_GAIM_SCROLL_BOOK_H__ +#ifndef __PIDGIN_SCROLL_BOOK_H__ +#define __PIDGIN_SCROLL_BOOK_H__ #include <gtk/gtk.h> @@ -34,17 +34,17 @@ G_BEGIN_DECLS -#define GTK_GAIM_TYPE_SCROLL_BOOK (gtk_gaim_scroll_book_get_type ()) -#define GTK_GAIM_SCROLL_BOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_GAIM_TYPE_SCROLL_BOOK, GtkGaimScrollBook)) -#define GTK_GAIM_SCROLL_BOOK_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_GAIM_TYPE_SCROLL_BOOK, GtkGaimScrollBookClass)) -#define GTK_GAIM_IS_SCROLL_BOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_GAIM_TYPE_SCROLL_BOOK)) -#define GTK_GAIM_IS_SCROLL_BOOK_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_GAIM_TYPE_SCROLL_BOOK)) -#define GTK_GAIM_SCROLL_BOOK_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_GAIM_TYPE_SCROLL_BOOK, GtkGaimScrollBookClass)) +#define PIDGIN_TYPE_SCROLL_BOOK (pidgin_scroll_book_get_type ()) +#define PIDGIN_SCROLL_BOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_SCROLL_BOOK, PidginScrollBook)) +#define PIDGIN_SCROLL_BOOK_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), PIDGIN_TYPE_SCROLL_BOOK, PidginScrollBookClass)) +#define PIDGIN_IS_SCROLL_BOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_SCROLL_BOOK)) +#define PIDGIN_IS_SCROLL_BOOK_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), PIDGIN_TYPE_SCROLL_BOOK)) +#define PIDGIN_SCROLL_BOOK_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), PIDGIN_TYPE_SCROLL_BOOK, PidginScrollBookClass)) -typedef struct _GtkGaimScrollBook GtkGaimScrollBook; -typedef struct _GtkGaimScrollBookClass GtkGaimScrollBookClass; +typedef struct _PidginScrollBook PidginScrollBook; +typedef struct _PidginScrollBookClass PidginScrollBookClass; -struct _GtkGaimScrollBook +struct _PidginScrollBook { GtkVBox parent_instance; @@ -63,7 +63,7 @@ struct _GtkGaimScrollBook }; -struct _GtkGaimScrollBookClass +struct _PidginScrollBookClass { GtkComboBoxClass parent_class; @@ -75,9 +75,9 @@ struct _GtkGaimScrollBookClass }; -GType gtk_gaim_scroll_book_get_type (void) G_GNUC_CONST; -GtkWidget *gtk_gaim_scroll_book_new (void); +GType pidgin_scroll_book_get_type (void) G_GNUC_CONST; +GtkWidget *pidgin_scroll_book_new (void); G_END_DECLS -#endif /* __GTK_GAIM_SCROLL_BOOK_H__ */ +#endif /* __PIDGIN_SCROLL_BOOK_H__ */ diff --git a/pidgin/gtksound.c b/pidgin/gtksound.c index aec8a05655..6702c4aa1b 100644 --- a/pidgin/gtksound.c +++ b/pidgin/gtksound.c @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #ifdef _WIN32 #include <windows.h> diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c index f69e877ad4..aca6745d2d 100644 --- a/pidgin/gtkstatusbox.c +++ b/pidgin/gtkstatusbox.c @@ -48,7 +48,7 @@ #include "status.h" #include "debug.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtksavedstatuses.h" #include "gaimstock.h" #include "gtkstatusbox.h" @@ -65,29 +65,29 @@ static void imhtml_changed_cb(GtkTextBuffer *buffer, void *data); static void imhtml_format_changed_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, void *data); -static void remove_typing_cb(GtkGaimStatusBox *box); -static void update_size (GtkGaimStatusBox *box); -static gint get_statusbox_index(GtkGaimStatusBox *box, GaimSavedStatus *saved_status); - -static void gtk_gaim_status_box_pulse_typing(GtkGaimStatusBox *status_box); -static void gtk_gaim_status_box_refresh(GtkGaimStatusBox *status_box); -static void status_menu_refresh_iter(GtkGaimStatusBox *status_box); -static void gtk_gaim_status_box_regenerate(GtkGaimStatusBox *status_box); -static void gtk_gaim_status_box_changed(GtkGaimStatusBox *box); -static void gtk_gaim_status_box_size_request (GtkWidget *widget, GtkRequisition *requisition); -static void gtk_gaim_status_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static gboolean gtk_gaim_status_box_expose_event (GtkWidget *widget, GdkEventExpose *event); -static void gtk_gaim_status_box_redisplay_buddy_icon(GtkGaimStatusBox *status_box); -static void gtk_gaim_status_box_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); -static void pidgin_status_box_popup(GtkGaimStatusBox *box); -static void pidgin_status_box_popdown(GtkGaimStatusBox *box); +static void remove_typing_cb(PidginStatusBox *box); +static void update_size (PidginStatusBox *box); +static gint get_statusbox_index(PidginStatusBox *box, GaimSavedStatus *saved_status); + +static void pidgin_status_box_pulse_typing(PidginStatusBox *status_box); +static void pidgin_status_box_refresh(PidginStatusBox *status_box); +static void status_menu_refresh_iter(PidginStatusBox *status_box); +static void pidgin_status_box_regenerate(PidginStatusBox *status_box); +static void pidgin_status_box_changed(PidginStatusBox *box); +static void pidgin_status_box_size_request (GtkWidget *widget, GtkRequisition *requisition); +static void pidgin_status_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation); +static gboolean pidgin_status_box_expose_event (GtkWidget *widget, GdkEventExpose *event); +static void pidgin_status_box_redisplay_buddy_icon(PidginStatusBox *status_box); +static void pidgin_status_box_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); +static void pidgin_status_box_popup(PidginStatusBox *box); +static void pidgin_status_box_popdown(PidginStatusBox *box); static void do_colorshift (GdkPixbuf *dest, GdkPixbuf *src, int shift); static void icon_choose_cb(const char *filename, gpointer data); -static void remove_buddy_icon_cb(GtkWidget *w, GtkGaimStatusBox *box); +static void remove_buddy_icon_cb(GtkWidget *w, PidginStatusBox *box); enum { - /** A GtkGaimStatusBoxItemType */ + /** A PidginStatusBoxItemType */ TYPE_COLUMN, /** @@ -123,11 +123,11 @@ enum { GtkContainerClass *parent_class = NULL; -static void gtk_gaim_status_box_class_init (GtkGaimStatusBoxClass *klass); -static void gtk_gaim_status_box_init (GtkGaimStatusBox *status_box); +static void pidgin_status_box_class_init (PidginStatusBoxClass *klass); +static void pidgin_status_box_init (PidginStatusBox *status_box); GType -gtk_gaim_status_box_get_type (void) +pidgin_status_box_get_type (void) { static GType status_box_type = 0; @@ -135,20 +135,20 @@ gtk_gaim_status_box_get_type (void) { static const GTypeInfo status_box_info = { - sizeof (GtkGaimStatusBoxClass), + sizeof (PidginStatusBoxClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) gtk_gaim_status_box_class_init, + (GClassInitFunc) pidgin_status_box_class_init, NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (GtkGaimStatusBox), + sizeof (PidginStatusBox), 0, - (GInstanceInitFunc) gtk_gaim_status_box_init, + (GInstanceInitFunc) pidgin_status_box_init, NULL /* value_table */ }; status_box_type = g_type_register_static(GTK_TYPE_CONTAINER, - "GtkGaimStatusBox", + "PidginStatusBox", &status_box_info, 0); } @@ -157,10 +157,10 @@ gtk_gaim_status_box_get_type (void) } static void -gtk_gaim_status_box_get_property(GObject *object, guint param_id, +pidgin_status_box_get_property(GObject *object, guint param_id, GValue *value, GParamSpec *psec) { - GtkGaimStatusBox *statusbox = GTK_GAIM_STATUS_BOX(object); + PidginStatusBox *statusbox = PIDGIN_STATUS_BOX(object); switch (param_id) { case PROP_ACCOUNT: @@ -176,7 +176,7 @@ gtk_gaim_status_box_get_property(GObject *object, guint param_id, } static void -update_to_reflect_account_status(GtkGaimStatusBox *status_box, GaimAccount *account, GaimStatus *newstatus) +update_to_reflect_account_status(PidginStatusBox *status_box, GaimAccount *account, GaimStatus *newstatus) { const GList *l; int status_no = -1; @@ -221,12 +221,12 @@ update_to_reflect_account_status(GtkGaimStatusBox *status_box, GaimAccount *acco gtk_imhtml_append_text(GTK_IMHTML(status_box->imhtml), message, 0); } gtk_widget_set_sensitive(GTK_WIDGET(status_box), TRUE); - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } } static void -account_status_changed_cb(GaimAccount *account, GaimStatus *oldstatus, GaimStatus *newstatus, GtkGaimStatusBox *status_box) +account_status_changed_cb(GaimAccount *account, GaimStatus *oldstatus, GaimStatus *newstatus, PidginStatusBox *status_box) { if (status_box->account == account) update_to_reflect_account_status(status_box, account, newstatus); @@ -235,7 +235,7 @@ account_status_changed_cb(GaimAccount *account, GaimStatus *oldstatus, GaimStatu } static gboolean -icon_box_press_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *box) +icon_box_press_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *box) { if (event->button == 3) { GtkWidget *menu_item; @@ -268,7 +268,7 @@ icon_box_press_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *bo static void icon_box_dnd_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, - GtkSelectionData *sd, guint info, guint t, GtkGaimStatusBox *box) + GtkSelectionData *sd, guint info, guint t, PidginStatusBox *box) { gchar *name = (gchar *)sd->data; @@ -297,7 +297,7 @@ icon_box_dnd_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, static gboolean -icon_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, GtkGaimStatusBox *box) +icon_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, PidginStatusBox *box) { gdk_window_set_cursor(widget->window, box->hand_cursor); gtk_image_set_from_pixbuf(GTK_IMAGE(box->icon), box->buddy_icon_hover); @@ -305,7 +305,7 @@ icon_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, GtkGaimStatusBox * } static gboolean -icon_box_leave_cb(GtkWidget *widget, GdkEventCrossing *event, GtkGaimStatusBox *box) +icon_box_leave_cb(GtkWidget *widget, GdkEventCrossing *event, PidginStatusBox *box) { gdk_window_set_cursor(widget->window, box->arrow_cursor); gtk_image_set_from_pixbuf(GTK_IMAGE(box->icon), box->buddy_icon) ; @@ -320,7 +320,7 @@ static const GtkTargetEntry dnd_targets[] = { }; static void -setup_icon_box(GtkGaimStatusBox *status_box) +setup_icon_box(PidginStatusBox *status_box) { if (status_box->icon_box != NULL) return; @@ -334,12 +334,12 @@ setup_icon_box(GtkGaimStatusBox *status_box) !gaim_account_get_bool(status_box->account, "use-global-buddyicon", TRUE)) { char *string = gaim_buddy_icons_get_full_path(gaim_account_get_buddy_icon(status_box->account)); - gtk_gaim_status_box_set_buddy_icon(status_box, string); + pidgin_status_box_set_buddy_icon(status_box, string); g_free(string); } else { - gtk_gaim_status_box_set_buddy_icon(status_box, gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon")); + pidgin_status_box_set_buddy_icon(status_box, gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon")); } status_box->hand_cursor = gdk_cursor_new (GDK_HAND2); @@ -363,7 +363,7 @@ setup_icon_box(GtkGaimStatusBox *status_box) } static void -destroy_icon_box(GtkGaimStatusBox *statusbox) +destroy_icon_box(PidginStatusBox *statusbox) { if (statusbox->icon_box == NULL) return; @@ -394,10 +394,10 @@ destroy_icon_box(GtkGaimStatusBox *statusbox) } static void -gtk_gaim_status_box_set_property(GObject *object, guint param_id, +pidgin_status_box_set_property(GObject *object, guint param_id, const GValue *value, GParamSpec *pspec) { - GtkGaimStatusBox *statusbox = GTK_GAIM_STATUS_BOX(object); + PidginStatusBox *statusbox = PIDGIN_STATUS_BOX(object); switch (param_id) { case PROP_ICON_SEL: @@ -419,7 +419,7 @@ gtk_gaim_status_box_set_property(GObject *object, guint param_id, case PROP_ACCOUNT: statusbox->account = g_value_get_pointer(value); - gtk_gaim_status_box_regenerate(statusbox); + pidgin_status_box_regenerate(statusbox); break; default: @@ -429,9 +429,9 @@ gtk_gaim_status_box_set_property(GObject *object, guint param_id, } static void -gtk_gaim_status_box_finalize(GObject *obj) +pidgin_status_box_finalize(GObject *obj) { - GtkGaimStatusBox *statusbox = GTK_GAIM_STATUS_BOX(obj); + PidginStatusBox *statusbox = PIDGIN_STATUS_BOX(obj); gaim_signals_disconnect_by_handle(statusbox); gaim_prefs_disconnect_by_handle(statusbox); @@ -451,13 +451,13 @@ gtk_gaim_status_box_finalize(GObject *obj) } static GType -gtk_gaim_status_box_child_type (GtkContainer *container) +pidgin_status_box_child_type (GtkContainer *container) { return GTK_TYPE_WIDGET; } static void -gtk_gaim_status_box_class_init (GtkGaimStatusBoxClass *klass) +pidgin_status_box_class_init (PidginStatusBoxClass *klass) { GObjectClass *object_class; GtkWidgetClass *widget_class; @@ -466,20 +466,20 @@ gtk_gaim_status_box_class_init (GtkGaimStatusBoxClass *klass) parent_class = g_type_class_peek_parent(klass); widget_class = (GtkWidgetClass*)klass; - widget_class->size_request = gtk_gaim_status_box_size_request; - widget_class->size_allocate = gtk_gaim_status_box_size_allocate; - widget_class->expose_event = gtk_gaim_status_box_expose_event; + widget_class->size_request = pidgin_status_box_size_request; + widget_class->size_allocate = pidgin_status_box_size_allocate; + widget_class->expose_event = pidgin_status_box_expose_event; - container_class->child_type = gtk_gaim_status_box_child_type; - container_class->forall = gtk_gaim_status_box_forall; + container_class->child_type = pidgin_status_box_child_type; + container_class->forall = pidgin_status_box_forall; container_class->remove = NULL; object_class = (GObjectClass *)klass; - object_class->finalize = gtk_gaim_status_box_finalize; + object_class->finalize = pidgin_status_box_finalize; - object_class->get_property = gtk_gaim_status_box_get_property; - object_class->set_property = gtk_gaim_status_box_set_property; + object_class->get_property = pidgin_status_box_get_property; + object_class->set_property = pidgin_status_box_set_property; g_object_class_install_property(object_class, PROP_ACCOUNT, @@ -506,7 +506,7 @@ gtk_gaim_status_box_class_init (GtkGaimStatusBoxClass *klass) * should modify status_box->store */ static void -gtk_gaim_status_box_refresh(GtkGaimStatusBox *status_box) +pidgin_status_box_refresh(PidginStatusBox *status_box) { GtkIconSize icon_size; GtkStyle *style; @@ -536,7 +536,7 @@ gtk_gaim_status_box_refresh(GtkGaimStatusBox *status_box) if (status_box->typing != 0) { GtkTreeIter iter; - GtkGaimStatusBoxItemType type; + PidginStatusBoxItemType type; gpointer data; /* Primary (get the status selected in the dropdown) */ @@ -549,7 +549,7 @@ gtk_gaim_status_box_refresh(GtkGaimStatusBox *status_box) TYPE_COLUMN, &type, DATA_COLUMN, &data, -1); - if (type == GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE) + if (type == PIDGIN_STATUS_BOX_TYPE_PRIMITIVE) primary = g_strdup(gaim_primitive_get_name_from_type(GPOINTER_TO_INT(data))); else /* This should never happen, but just in case... */ @@ -635,7 +635,7 @@ gtk_gaim_status_box_refresh(GtkGaimStatusBox *status_box) /* Overlay a disk in the bottom left corner */ emblem = gtk_widget_render_icon(GTK_WIDGET(status_box->vbox), - GTK_STOCK_SAVE, icon_size, "GtkGaimStatusBox"); + GTK_STOCK_SAVE, icon_size, "PidginStatusBox"); if (emblem != NULL) { int width, height; @@ -714,7 +714,7 @@ find_status_type_by_index(const GaimAccount *account, gint active) * keyboard signals instead of the changed signal? */ static void -status_menu_refresh_iter(GtkGaimStatusBox *status_box) +status_menu_refresh_iter(PidginStatusBox *status_box) { GaimSavedStatus *saved_status; GaimStatusPrimitive primitive; @@ -750,7 +750,7 @@ status_menu_refresh_iter(GtkGaimStatusBox *status_box) else { GtkTreeIter iter; - GtkGaimStatusBoxItemType type; + PidginStatusBoxItemType type; gpointer data; /* If this saved status is in the list store, then set it as the active item */ @@ -766,7 +766,7 @@ status_menu_refresh_iter(GtkGaimStatusBox *status_box) /* This is a special case because Primitives for the token_status_account are actually * saved statuses with substatuses for the enabled accounts */ if (status_box->token_status_account && gaim_savedstatus_is_transient(saved_status) - && type == GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE && primitive == GPOINTER_TO_INT(data)) + && type == PIDGIN_STATUS_BOX_TYPE_PRIMITIVE && primitive == GPOINTER_TO_INT(data)) { char *name; const char *acct_status_name = gaim_status_get_name( @@ -785,7 +785,7 @@ status_menu_refresh_iter(GtkGaimStatusBox *status_box) } g_free(name); - } else if ((type == GTK_GAIM_STATUS_BOX_TYPE_POPULAR) && + } else if ((type == PIDGIN_STATUS_BOX_TYPE_POPULAR) && (GPOINTER_TO_INT(data) == gaim_savedstatus_get_creation_time(saved_status))) { /* Found! */ @@ -834,7 +834,7 @@ status_menu_refresh_iter(GtkGaimStatusBox *status_box) } static void -add_popular_statuses(GtkGaimStatusBox *statusbox) +add_popular_statuses(PidginStatusBox *statusbox) { GtkIconSize icon_size; GList *list, *cur; @@ -848,7 +848,7 @@ add_popular_statuses(GtkGaimStatusBox *statusbox) icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); - gtk_gaim_status_box_add_separator(statusbox); + pidgin_status_box_add_separator(statusbox); for (cur = list; cur != NULL; cur = cur->next) { @@ -895,7 +895,7 @@ add_popular_statuses(GtkGaimStatusBox *statusbox) #if 0 /* Overlay a disk in the bottom left corner */ emblem = gtk_widget_render_icon(GTK_WIDGET(statusbox->vbox), - GTK_STOCK_SAVE, icon_size, "GtkGaimStatusBox"); + GTK_STOCK_SAVE, icon_size, "PidginStatusBox"); if (emblem != NULL) { width = gdk_pixbuf_get_width(pixbuf) / 2; @@ -908,7 +908,7 @@ add_popular_statuses(GtkGaimStatusBox *statusbox) #endif } - gtk_gaim_status_box_add(statusbox, GTK_GAIM_STATUS_BOX_TYPE_POPULAR, + pidgin_status_box_add(statusbox, PIDGIN_STATUS_BOX_TYPE_POPULAR, pixbuf, gaim_savedstatus_get_title(saved), stripped, GINT_TO_POINTER(gaim_savedstatus_get_creation_time(saved))); g_free(stripped); @@ -970,7 +970,7 @@ static GaimAccount* check_active_accounts_for_identical_statuses() } static void -add_account_statuses(GtkGaimStatusBox *status_box, GaimAccount *account) +add_account_statuses(PidginStatusBox *status_box, GaimAccount *account) { /* Per-account */ const GList *l; @@ -1003,8 +1003,8 @@ add_account_statuses(GtkGaimStatusBox *status_box, GaimAccount *account) pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE, icon_size, "PidginStatusBox"); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), - GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, + pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), + PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, gaim_status_type_get_name(status_type), NULL, GINT_TO_POINTER(gaim_status_type_get_primitive(status_type))); @@ -1014,7 +1014,7 @@ add_account_statuses(GtkGaimStatusBox *status_box, GaimAccount *account) } static void -gtk_gaim_status_box_regenerate(GtkGaimStatusBox *status_box) +pidgin_status_box_regenerate(PidginStatusBox *status_box) { GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4; GtkIconSize icon_size; @@ -1032,7 +1032,7 @@ gtk_gaim_status_box_regenerate(GtkGaimStatusBox *status_box) if (status_box->account == NULL) { pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AVAILABLE, - icon_size, "GtkGaimStatusBox"); + icon_size, "PidginStatusBox"); /* Do all the currently enabled accounts have the same statuses? * If so, display them instead of our global list. */ @@ -1047,10 +1047,10 @@ gtk_gaim_status_box_regenerate(GtkGaimStatusBox *status_box) pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AVAILABLE_I, icon_size, "PidginStatusBox"); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, _("Available"), NULL, GINT_TO_POINTER(GAIM_STATUS_AVAILABLE)); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf2, _("Away"), NULL, GINT_TO_POINTER(GAIM_STATUS_AWAY)); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf4, _("Invisible"), NULL, GINT_TO_POINTER(GAIM_STATUS_INVISIBLE)); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf3, _("Offline"), NULL, GINT_TO_POINTER(GAIM_STATUS_OFFLINE)); + pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, _("Available"), NULL, GINT_TO_POINTER(GAIM_STATUS_AVAILABLE)); + pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf2, _("Away"), NULL, GINT_TO_POINTER(GAIM_STATUS_AWAY)); + pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf4, _("Invisible"), NULL, GINT_TO_POINTER(GAIM_STATUS_INVISIBLE)); + pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf3, _("Offline"), NULL, GINT_TO_POINTER(GAIM_STATUS_OFFLINE)); if (pixbuf2) g_object_unref(G_OBJECT(pixbuf2)); if (pixbuf3) g_object_unref(G_OBJECT(pixbuf3)); @@ -1059,13 +1059,13 @@ gtk_gaim_status_box_regenerate(GtkGaimStatusBox *status_box) add_popular_statuses(status_box); - gtk_gaim_status_box_add_separator(GTK_GAIM_STATUS_BOX(status_box)); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_CUSTOM, pixbuf, _("New..."), NULL, NULL); - gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_SAVED, pixbuf, _("Saved..."), NULL, NULL); + pidgin_status_box_add_separator(PIDGIN_STATUS_BOX(status_box)); + pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_CUSTOM, pixbuf, _("New..."), NULL, NULL); + pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_SAVED, pixbuf, _("Saved..."), NULL, NULL); if (pixbuf) g_object_unref(G_OBJECT(pixbuf)); status_menu_refresh_iter(status_box); - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } else { add_account_statuses(status_box, status_box->account); @@ -1078,7 +1078,7 @@ gtk_gaim_status_box_regenerate(GtkGaimStatusBox *status_box) static gboolean combo_box_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, GtkIMHtml *imhtml) { - pidgin_status_box_popup(GTK_GAIM_STATUS_BOX(w)); + pidgin_status_box_popup(PIDGIN_STATUS_BOX(w)); return TRUE; } @@ -1091,7 +1091,7 @@ static gboolean imhtml_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, GtkI return TRUE; } -static int imhtml_remove_focus(GtkWidget *w, GdkEventKey *event, GtkGaimStatusBox *status_box) +static int imhtml_remove_focus(GtkWidget *w, GdkEventKey *event, PidginStatusBox *status_box) { if (event->keyval == GDK_Tab || event->keyval == GDK_KP_Tab) { @@ -1115,12 +1115,12 @@ static int imhtml_remove_focus(GtkWidget *w, GdkEventKey *event, GtkGaimStatusBo gaim_account_get_active_status(status_box->account)); else { status_menu_refresh_iter(status_box); - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } return TRUE; } - gtk_gaim_status_box_pulse_typing(status_box); + pidgin_status_box_pulse_typing(status_box); g_source_remove(status_box->typing); status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box); @@ -1132,11 +1132,11 @@ static gboolean dropdown_store_row_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer data) { - GtkGaimStatusBoxItemType type; + PidginStatusBoxItemType type; gtk_tree_model_get(model, iter, TYPE_COLUMN, &type, -1); - if (type == GTK_GAIM_STATUS_BOX_TYPE_SEPARATOR) + if (type == PIDGIN_STATUS_BOX_TYPE_SEPARATOR) return TRUE; return FALSE; @@ -1144,7 +1144,7 @@ dropdown_store_row_separator_func(GtkTreeModel *model, #endif static void -cache_pixbufs(GtkGaimStatusBox *status_box) +cache_pixbufs(PidginStatusBox *status_box) { GtkIconSize icon_size; @@ -1190,23 +1190,23 @@ cache_pixbufs(GtkGaimStatusBox *status_box) icon_size, "PidginStatusBox"); } -static void account_enabled_cb(GaimAccount *acct, GtkGaimStatusBox *status_box) { +static void account_enabled_cb(GaimAccount *acct, PidginStatusBox *status_box) { GaimAccount *initial_token_acct = status_box->token_status_account; status_box->token_status_account = check_active_accounts_for_identical_statuses(); /* Regenerate the list if it has changed */ if (initial_token_acct != status_box->token_status_account) { - gtk_gaim_status_box_regenerate(status_box); + pidgin_status_box_regenerate(status_box); } } static void -current_savedstatus_changed_cb(GaimSavedStatus *now, GaimSavedStatus *old, GtkGaimStatusBox *status_box) +current_savedstatus_changed_cb(GaimSavedStatus *now, GaimSavedStatus *old, PidginStatusBox *status_box) { /* Make sure our current status is added to the list of popular statuses */ - gtk_gaim_status_box_regenerate(status_box); + pidgin_status_box_regenerate(status_box); } static void @@ -1214,7 +1214,7 @@ spellcheck_prefs_cb(const char *name, GaimPrefType type, gconstpointer value, gpointer data) { #ifdef USE_GTKSPELL - GtkGaimStatusBox *status_box = (GtkGaimStatusBox *)data; + PidginStatusBox *status_box = (PidginStatusBox *)data; if (value) pidgin_setup_gtkspell(GTK_TEXT_VIEW(status_box->imhtml)); @@ -1228,7 +1228,7 @@ spellcheck_prefs_cb(const char *name, GaimPrefType type, } #if 0 -static gboolean button_released_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *box) +static gboolean button_released_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *box) { if (event->button != 1) @@ -1239,7 +1239,7 @@ static gboolean button_released_cb(GtkWidget *widget, GdkEventButton *event, Gtk return TRUE; } -static gboolean button_pressed_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *box) +static gboolean button_pressed_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *box) { if (event->button != 1) return FALSE; @@ -1251,7 +1251,7 @@ static gboolean button_pressed_cb(GtkWidget *widget, GdkEventButton *event, GtkG #endif static void -gtk_gaim_status_box_list_position (GtkGaimStatusBox *status_box, int *x, int *y, int *width, int *height) +pidgin_status_box_list_position (PidginStatusBox *status_box, int *x, int *y, int *width, int *height) { #if GTK_CHECK_VERSION(2,2,0) GdkScreen *screen; @@ -1351,10 +1351,10 @@ popup_grab_on_window (GdkWindow *window, static void -pidgin_status_box_popup(GtkGaimStatusBox *box) +pidgin_status_box_popup(PidginStatusBox *box) { int width, height, x, y; - gtk_gaim_status_box_list_position (box, &x, &y, &width, &height); + pidgin_status_box_list_position (box, &x, &y, &width, &height); gtk_widget_set_size_request (box->popup_window, width, height); gtk_window_move (GTK_WINDOW (box->popup_window), x, y); @@ -1378,7 +1378,7 @@ pidgin_status_box_popup(GtkGaimStatusBox *box) } static void -pidgin_status_box_popdown(GtkGaimStatusBox *box) { +pidgin_status_box_popdown(PidginStatusBox *box) { gtk_widget_hide(box->popup_window); box->popup_in_progress = FALSE; gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->toggle_button), @@ -1388,7 +1388,7 @@ pidgin_status_box_popdown(GtkGaimStatusBox *box) { static void -toggled_cb(GtkWidget *widget, GtkGaimStatusBox *box) +toggled_cb(GtkWidget *widget, PidginStatusBox *box) { if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { if (!box->popup_in_progress) @@ -1399,7 +1399,7 @@ toggled_cb(GtkWidget *widget, GtkGaimStatusBox *box) } static void -buddy_icon_set_cb(const char *filename, GtkGaimStatusBox *box) +buddy_icon_set_cb(const char *filename, PidginStatusBox *box) { if (box->account) { @@ -1437,11 +1437,11 @@ buddy_icon_set_cb(const char *filename, GtkGaimStatusBox *box) } } } - gtk_gaim_status_box_set_buddy_icon(box, filename); + pidgin_status_box_set_buddy_icon(box, filename); } static void -remove_buddy_icon_cb(GtkWidget *w, GtkGaimStatusBox *box) +remove_buddy_icon_cb(GtkWidget *w, PidginStatusBox *box) { if (box->account == NULL) /* The pref-connect callback does the actual work */ @@ -1456,7 +1456,7 @@ remove_buddy_icon_cb(GtkWidget *w, GtkGaimStatusBox *box) static void icon_choose_cb(const char *filename, gpointer data) { - GtkGaimStatusBox *box = data; + PidginStatusBox *box = data; if (filename) { if (box->account == NULL) /* The pref-connect callback does the actual work */ @@ -1472,11 +1472,11 @@ static void update_buddyicon_cb(const char *name, GaimPrefType type, gconstpointer value, gpointer data) { - buddy_icon_set_cb(value, (GtkGaimStatusBox*) data); + buddy_icon_set_cb(value, (PidginStatusBox*) data); } static void -treeview_activate_current_selection(GtkGaimStatusBox *status_box, GtkTreePath *path) +treeview_activate_current_selection(PidginStatusBox *status_box, GtkTreePath *path) { if (status_box->active_row) gtk_tree_row_reference_free(status_box->active_row); @@ -1484,11 +1484,11 @@ treeview_activate_current_selection(GtkGaimStatusBox *status_box, GtkTreePath *p status_box->active_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(status_box->dropdown_store), path); pidgin_status_box_popdown (status_box); - gtk_gaim_status_box_changed(status_box); + pidgin_status_box_changed(status_box); } static gboolean -treeview_button_release_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *status_box) +treeview_button_release_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *status_box) { GtkTreePath *path = NULL; int ret; @@ -1528,7 +1528,7 @@ treeview_button_release_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStat static gboolean treeview_key_press_event(GtkWidget *widget, - GdkEventKey *event, GtkGaimStatusBox *box) + GdkEventKey *event, PidginStatusBox *box) { if (box->popup_in_progress) { if (event->keyval == GDK_Escape) { @@ -1551,7 +1551,7 @@ treeview_key_press_event(GtkWidget *widget, } static void -gtk_gaim_status_box_init (GtkGaimStatusBox *status_box) +pidgin_status_box_init (PidginStatusBox *status_box) { GtkCellRenderer *text_rend; GtkCellRenderer *icon_rend; @@ -1704,7 +1704,7 @@ gtk_gaim_status_box_init (GtkGaimStatusBox *status_box) status_box->token_status_account = check_active_accounts_for_identical_statuses(); cache_pixbufs(status_box); - gtk_gaim_status_box_regenerate(status_box); + pidgin_status_box_regenerate(status_box); gaim_signal_connect(gaim_savedstatuses_get_handle(), "savedstatus-changed", status_box, @@ -1727,20 +1727,20 @@ gtk_gaim_status_box_init (GtkGaimStatusBox *status_box) } static void -gtk_gaim_status_box_size_request(GtkWidget *widget, +pidgin_status_box_size_request(GtkWidget *widget, GtkRequisition *requisition) { GtkRequisition box_req; gint border_width = GTK_CONTAINER (widget)->border_width; - gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->toggle_button, requisition); + gtk_widget_size_request(PIDGIN_STATUS_BOX(widget)->toggle_button, requisition); /* Make this icon the same size as other buddy icons in the list; unless it already wants to be bigger */ requisition->height = MAX(requisition->height, 34); requisition->height += border_width * 2; /* If the gtkimhtml is visible, then add some additional padding */ - gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->vbox, &box_req); + gtk_widget_size_request(PIDGIN_STATUS_BOX(widget)->vbox, &box_req); if (box_req.height > 1) requisition->height += box_req.height + border_width * 2; @@ -1788,10 +1788,10 @@ do_colorshift (GdkPixbuf *dest, GdkPixbuf *src, int shift) } static void -gtk_gaim_status_box_size_allocate(GtkWidget *widget, +pidgin_status_box_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { - GtkGaimStatusBox *status_box = GTK_GAIM_STATUS_BOX(widget); + PidginStatusBox *status_box = PIDGIN_STATUS_BOX(widget); GtkRequisition req = {0,0}; GtkAllocation parent_alc, box_alc, icon_alc; gint border_width = GTK_CONTAINER (widget)->border_width; @@ -1834,7 +1834,7 @@ gtk_gaim_status_box_size_allocate(GtkWidget *widget, if (status_box->icon_size != icon_alc.height) { status_box->icon_size = icon_alc.height; - gtk_gaim_status_box_redisplay_buddy_icon(status_box); + pidgin_status_box_redisplay_buddy_icon(status_box); } gtk_widget_size_allocate(status_box->icon_box, &icon_alc); } @@ -1843,10 +1843,10 @@ gtk_gaim_status_box_size_allocate(GtkWidget *widget, } static gboolean -gtk_gaim_status_box_expose_event(GtkWidget *widget, +pidgin_status_box_expose_event(GtkWidget *widget, GdkEventExpose *event) { - GtkGaimStatusBox *status_box = GTK_GAIM_STATUS_BOX(widget); + PidginStatusBox *status_box = PIDGIN_STATUS_BOX(widget); gtk_container_propagate_expose(GTK_CONTAINER(widget), status_box->vbox, event); gtk_container_propagate_expose(GTK_CONTAINER(widget), status_box->toggle_button, event); if (status_box->icon_box && status_box->icon_opaque) { @@ -1858,12 +1858,12 @@ gtk_gaim_status_box_expose_event(GtkWidget *widget, } static void -gtk_gaim_status_box_forall(GtkContainer *container, +pidgin_status_box_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data) { - GtkGaimStatusBox *status_box = GTK_GAIM_STATUS_BOX (container); + PidginStatusBox *status_box = PIDGIN_STATUS_BOX (container); if (include_internals) { @@ -1876,16 +1876,16 @@ gtk_gaim_status_box_forall(GtkContainer *container, } GtkWidget * -gtk_gaim_status_box_new() +pidgin_status_box_new() { - return g_object_new(GTK_GAIM_TYPE_STATUS_BOX, "account", NULL, + return g_object_new(PIDGIN_TYPE_STATUS_BOX, "account", NULL, "iconsel", TRUE, NULL); } GtkWidget * -gtk_gaim_status_box_new_with_account(GaimAccount *account) +pidgin_status_box_new_with_account(GaimAccount *account) { - return g_object_new(GTK_GAIM_TYPE_STATUS_BOX, "account", account, + return g_object_new(PIDGIN_TYPE_STATUS_BOX, "account", account, "iconsel", TRUE, NULL); } @@ -1893,7 +1893,7 @@ gtk_gaim_status_box_new_with_account(GaimAccount *account) * Add a row to the dropdown menu. * * @param status_box The status box itself. - * @param type A GtkGaimStatusBoxItemType. + * @param type A PidginStatusBoxItemType. * @param pixbuf The icon to associate with this row in the menu. * @param title The title of this item. For the primitive entries, * this is something like "Available" or "Away." For @@ -1910,7 +1910,7 @@ gtk_gaim_status_box_new_with_account(GaimAccount *account) * creation timestamp. */ void -gtk_gaim_status_box_add(GtkGaimStatusBox *status_box, GtkGaimStatusBoxItemType type, GdkPixbuf *pixbuf, const char *title, const char *desc, gpointer data) +pidgin_status_box_add(PidginStatusBox *status_box, PidginStatusBoxItemType type, GdkPixbuf *pixbuf, const char *title, const char *desc, gpointer data) { GtkTreeIter iter; char *text; @@ -1953,7 +1953,7 @@ gtk_gaim_status_box_add(GtkGaimStatusBox *status_box, GtkGaimStatusBoxItemType t } void -gtk_gaim_status_box_add_separator(GtkGaimStatusBox *status_box) +pidgin_status_box_add_separator(PidginStatusBox *status_box) { /* Don't do anything unless GTK actually supports * gtk_combo_box_set_row_separator_func */ @@ -1962,31 +1962,31 @@ gtk_gaim_status_box_add_separator(GtkGaimStatusBox *status_box) gtk_list_store_append(status_box->dropdown_store, &iter); gtk_list_store_set(status_box->dropdown_store, &iter, - TYPE_COLUMN, GTK_GAIM_STATUS_BOX_TYPE_SEPARATOR, + TYPE_COLUMN, PIDGIN_STATUS_BOX_TYPE_SEPARATOR, -1); #endif } void -gtk_gaim_status_box_set_network_available(GtkGaimStatusBox *status_box, gboolean available) +pidgin_status_box_set_network_available(PidginStatusBox *status_box, gboolean available) { if (!status_box) return; status_box->network_available = available; - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } void -gtk_gaim_status_box_set_connecting(GtkGaimStatusBox *status_box, gboolean connecting) +pidgin_status_box_set_connecting(PidginStatusBox *status_box, gboolean connecting) { if (!status_box) return; status_box->connecting = connecting; - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } static void -gtk_gaim_status_box_redisplay_buddy_icon(GtkGaimStatusBox *status_box) +pidgin_status_box_redisplay_buddy_icon(PidginStatusBox *status_box) { /* This is sometimes called before the box is shown, and we will not have a size */ @@ -2025,22 +2025,22 @@ gtk_gaim_status_box_redisplay_buddy_icon(GtkGaimStatusBox *status_box) } void -gtk_gaim_status_box_set_buddy_icon(GtkGaimStatusBox *status_box, const char *filename) +pidgin_status_box_set_buddy_icon(PidginStatusBox *status_box, const char *filename) { g_free(status_box->buddy_icon_path); status_box->buddy_icon_path = g_strdup(filename); - gtk_gaim_status_box_redisplay_buddy_icon(status_box); + pidgin_status_box_redisplay_buddy_icon(status_box); } const char* -gtk_gaim_status_box_get_buddy_icon(GtkGaimStatusBox *box) +pidgin_status_box_get_buddy_icon(PidginStatusBox *box) { return box->buddy_icon_path; } void -gtk_gaim_status_box_pulse_connecting(GtkGaimStatusBox *status_box) +pidgin_status_box_pulse_connecting(PidginStatusBox *status_box) { if (!status_box) return; @@ -2048,17 +2048,17 @@ gtk_gaim_status_box_pulse_connecting(GtkGaimStatusBox *status_box) status_box->connecting_index = 0; else status_box->connecting_index++; - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } static void -gtk_gaim_status_box_pulse_typing(GtkGaimStatusBox *status_box) +pidgin_status_box_pulse_typing(PidginStatusBox *status_box) { if (status_box->typing_index == 3) status_box->typing_index = 0; else status_box->typing_index++; - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } static gboolean @@ -2074,9 +2074,9 @@ message_changed(const char *one, const char *two) } static void -activate_currently_selected_status(GtkGaimStatusBox *status_box) +activate_currently_selected_status(PidginStatusBox *status_box) { - GtkGaimStatusBoxItemType type; + PidginStatusBoxItemType type; gpointer data; gchar *title; GtkTreeIter iter; @@ -2103,13 +2103,13 @@ activate_currently_selected_status(GtkGaimStatusBox *status_box) * accordingly by connecting to the savedstatus-changed * signal and then calling status_menu_refresh_iter() */ - if (type != GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE) + if (type != PIDGIN_STATUS_BOX_TYPE_PRIMITIVE) return; gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter, TITLE_COLUMN, &title, -1); - message = gtk_gaim_status_box_get_message(status_box); + message = pidgin_status_box_get_message(status_box); if (!message || !*message) { gtk_widget_hide_all(status_box->vbox); @@ -2266,7 +2266,7 @@ activate_currently_selected_status(GtkGaimStatusBox *status_box) g_free(message); } -static void update_size(GtkGaimStatusBox *status_box) +static void update_size(PidginStatusBox *status_box) { GtkTextBuffer *buffer; GtkTextIter iter; @@ -2307,7 +2307,7 @@ static void update_size(GtkGaimStatusBox *status_box) gtk_widget_set_size_request(status_box->vbox, -1, height + GAIM_HIG_BOX_SPACE); } -static void remove_typing_cb(GtkGaimStatusBox *status_box) +static void remove_typing_cb(PidginStatusBox *status_box) { if (status_box->typing == 0) { @@ -2320,14 +2320,14 @@ static void remove_typing_cb(GtkGaimStatusBox *status_box) status_box->typing = 0; activate_currently_selected_status(status_box); - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } -static void gtk_gaim_status_box_changed(GtkGaimStatusBox *status_box) +static void pidgin_status_box_changed(PidginStatusBox *status_box) { GtkTreePath *path = gtk_tree_row_reference_get_path(status_box->active_row); GtkTreeIter iter; - GtkGaimStatusBoxItemType type; + PidginStatusBoxItemType type; gpointer data; GList *accounts = NULL, *node; int active; @@ -2349,7 +2349,7 @@ static void gtk_gaim_status_box_changed(GtkGaimStatusBox *status_box) if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(status_box))) { - if (type == GTK_GAIM_STATUS_BOX_TYPE_POPULAR) + if (type == PIDGIN_STATUS_BOX_TYPE_POPULAR) { GaimSavedStatus *saved; saved = gaim_savedstatus_find_by_creation_time(GPOINTER_TO_INT(data)); @@ -2358,7 +2358,7 @@ static void gtk_gaim_status_box_changed(GtkGaimStatusBox *status_box) return; } - if (type == GTK_GAIM_STATUS_BOX_TYPE_CUSTOM) + if (type == PIDGIN_STATUS_BOX_TYPE_CUSTOM) { GaimSavedStatus *saved_status; saved_status = gaim_savedstatus_get_current(); @@ -2369,7 +2369,7 @@ static void gtk_gaim_status_box_changed(GtkGaimStatusBox *status_box) return; } - if (type == GTK_GAIM_STATUS_BOX_TYPE_SAVED) + if (type == PIDGIN_STATUS_BOX_TYPE_SAVED) { pidgin_status_window_show(); status_menu_refresh_iter(status_box); @@ -2419,11 +2419,11 @@ static void gtk_gaim_status_box_changed(GtkGaimStatusBox *status_box) return; } } - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } static gint -get_statusbox_index(GtkGaimStatusBox *box, GaimSavedStatus *saved_status) +get_statusbox_index(PidginStatusBox *box, GaimSavedStatus *saved_status) { gint index; @@ -2451,16 +2451,16 @@ get_statusbox_index(GtkGaimStatusBox *box, GaimSavedStatus *saved_status) static void imhtml_changed_cb(GtkTextBuffer *buffer, void *data) { - GtkGaimStatusBox *status_box = (GtkGaimStatusBox*)data; + PidginStatusBox *status_box = (PidginStatusBox*)data; if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(status_box))) { if (status_box->typing != 0) { - gtk_gaim_status_box_pulse_typing(status_box); + pidgin_status_box_pulse_typing(status_box); g_source_remove(status_box->typing); } status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box); } - gtk_gaim_status_box_refresh(status_box); + pidgin_status_box_refresh(status_box); } static void imhtml_format_changed_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, void *data) @@ -2468,7 +2468,7 @@ static void imhtml_format_changed_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons imhtml_changed_cb(NULL, data); } -char *gtk_gaim_status_box_get_message(GtkGaimStatusBox *status_box) +char *pidgin_status_box_get_message(PidginStatusBox *status_box) { if (status_box->imhtml_visible) return gtk_imhtml_get_markup(GTK_IMHTML(status_box->imhtml)); diff --git a/pidgin/gtkstatusbox.h b/pidgin/gtkstatusbox.h index dbcfabada5..fd604cfe49 100644 --- a/pidgin/gtkstatusbox.h +++ b/pidgin/gtkstatusbox.h @@ -24,8 +24,8 @@ */ -#ifndef __GTK_GAIM_STATUS_BOX_H__ -#define __GTK_GAIM_STATUS_BOX_H__ +#ifndef __PIDGIN_STATUS_BOX_H__ +#define __PIDGIN_STATUS_BOX_H__ #include <gtk/gtk.h> #include "gtkimhtml.h" @@ -37,12 +37,12 @@ G_BEGIN_DECLS -#define GTK_GAIM_TYPE_STATUS_BOX (gtk_gaim_status_box_get_type ()) -#define GTK_GAIM_STATUS_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_GAIM_TYPE_STATUS_BOX, GtkGaimStatusBox)) -#define GTK_GAIM_STATUS_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_GAIM_TYPE_STATUS_BOX, GtkGaimStatusBoxClass)) -#define GTK_GAIM_IS_STATUS_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_GAIM_TYPE_STATUS_BOX)) -#define GTK_GAIM_IS_STATUS_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_GAIM_TYPE_STATUS_BOX)) -#define GTK_GAIM_STATUS_BOX_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_GAIM_TYPE_STATUS_BOX, GtkGaimStatusBoxClass)) +#define PIDGIN_TYPE_STATUS_BOX (pidgin_status_box_get_type ()) +#define PIDGIN_STATUS_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_STATUS_BOX, PidginStatusBox)) +#define PIDGIN_STATUS_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), PIDGIN_TYPE_STATUS_BOX, PidginStatusBoxClass)) +#define PIDGIN_IS_STATUS_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_STATUS_BOX)) +#define PIDGIN_IS_STATUS_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), PIDGIN_TYPE_STATUS_BOX)) +#define PIDGIN_STATUS_BOX_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), PIDGIN_TYPE_STATUS_BOX, PidginStatusBoxClass)) /** * This is a hidden field in the GtkStatusBox that identifies the @@ -52,18 +52,18 @@ G_BEGIN_DECLS */ typedef enum { - GTK_GAIM_STATUS_BOX_TYPE_SEPARATOR, - GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, - GTK_GAIM_STATUS_BOX_TYPE_POPULAR, - GTK_GAIM_STATUS_BOX_TYPE_CUSTOM, - GTK_GAIM_STATUS_BOX_TYPE_SAVED, - GTK_GAIM_STATUS_BOX_NUM_TYPES -} GtkGaimStatusBoxItemType; - -typedef struct _GtkGaimStatusBox GtkGaimStatusBox; -typedef struct _GtkGaimStatusBoxClass GtkGaimStatusBoxClass; - -struct _GtkGaimStatusBox + PIDGIN_STATUS_BOX_TYPE_SEPARATOR, + PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, + PIDGIN_STATUS_BOX_TYPE_POPULAR, + PIDGIN_STATUS_BOX_TYPE_CUSTOM, + PIDGIN_STATUS_BOX_TYPE_SAVED, + PIDGIN_STATUS_BOX_NUM_TYPES +} PidginStatusBoxItemType; + +typedef struct _PidginStatusBox PidginStatusBox; +typedef struct _PidginStatusBoxClass PidginStatusBoxClass; + +struct _PidginStatusBox { GtkContainer parent_instance; @@ -140,7 +140,7 @@ struct _GtkGaimStatusBox GtkTreeRowReference *active_row; }; -struct _GtkGaimStatusBoxClass +struct _PidginStatusBoxClass { GtkContainerClass parent_class; @@ -155,32 +155,32 @@ struct _GtkGaimStatusBoxClass }; -GType gtk_gaim_status_box_get_type (void) G_GNUC_CONST; -GtkWidget *gtk_gaim_status_box_new (void); -GtkWidget *gtk_gaim_status_box_new_with_account (GaimAccount *); +GType pidgin_status_box_get_type (void) G_GNUC_CONST; +GtkWidget *pidgin_status_box_new (void); +GtkWidget *pidgin_status_box_new_with_account (GaimAccount *); void -gtk_gaim_status_box_add(GtkGaimStatusBox *status_box, GtkGaimStatusBoxItemType type, GdkPixbuf *pixbuf, const char *text, const char *sec_text, gpointer data); +pidgin_status_box_add(PidginStatusBox *status_box, PidginStatusBoxItemType type, GdkPixbuf *pixbuf, const char *text, const char *sec_text, gpointer data); void -gtk_gaim_status_box_add_separator(GtkGaimStatusBox *status_box); +pidgin_status_box_add_separator(PidginStatusBox *status_box); void -gtk_gaim_status_box_set_network_available(GtkGaimStatusBox *status_box, gboolean available); +pidgin_status_box_set_network_available(PidginStatusBox *status_box, gboolean available); void -gtk_gaim_status_box_set_connecting(GtkGaimStatusBox *status_box, gboolean connecting); +pidgin_status_box_set_connecting(PidginStatusBox *status_box, gboolean connecting); void -gtk_gaim_status_box_pulse_connecting(GtkGaimStatusBox *status_box); +pidgin_status_box_pulse_connecting(PidginStatusBox *status_box); void -gtk_gaim_status_box_set_buddy_icon(GtkGaimStatusBox *status_box, const char *filename); +pidgin_status_box_set_buddy_icon(PidginStatusBox *status_box, const char *filename); const char * -gtk_gaim_status_box_get_buddy_icon(GtkGaimStatusBox *status_box); +pidgin_status_box_get_buddy_icon(PidginStatusBox *status_box); -char *gtk_gaim_status_box_get_message(GtkGaimStatusBox *status_box); +char *pidgin_status_box_get_message(PidginStatusBox *status_box); G_END_DECLS diff --git a/pidgin/gtkthemes.c b/pidgin/gtkthemes.c index 42b4db7491..a9ab364d88 100644 --- a/pidgin/gtkthemes.c +++ b/pidgin/gtkthemes.c @@ -21,7 +21,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "debug.h" diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c index 6bc5706fc3..2665e6e850 100644 --- a/pidgin/gtkutils.c +++ b/pidgin/gtkutils.c @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #ifndef _WIN32 # include <X11/Xlib.h> diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h index 6083d8222f..b8e3ed4119 100644 --- a/pidgin/gtkutils.h +++ b/pidgin/gtkutils.h @@ -26,7 +26,7 @@ #define _PIDGINUTILS_H_ #include "gtkconv.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "prpl.h" #include "util.h" diff --git a/pidgin/gtkwhiteboard.h b/pidgin/gtkwhiteboard.h index de56c77669..7f3ab8469d 100644 --- a/pidgin/gtkwhiteboard.h +++ b/pidgin/gtkwhiteboard.h @@ -1,5 +1,5 @@ /** - * @file gtkwhiteboard.h The GtkGaimWhiteboard frontend object + * @file gtkwhiteboard.h The PidginWhiteboard frontend object * * gaim * @@ -25,7 +25,7 @@ #ifndef _PIDGINWHITEBOARD_H_ #define _PIDGINWHITEBOARD_H_ -#include "gtkgaim.h" +#include "pidgin.h" #include "whiteboard.h" diff --git a/pidgin/gtkgaim.h b/pidgin/pidgin.h index b8c100a237..04714aaf7e 100644 --- a/pidgin/gtkgaim.h +++ b/pidgin/pidgin.h @@ -1,5 +1,5 @@ /** - * @file gtkgaim.h UI definitions and includes + * @file pidgin.h UI definitions and includes * @ingroup gtkui * * gaim @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* #warning ***gtkgaim*** */ +/* #warning ***pidgin*** */ #ifndef _PIDGINGAIM_H_ #define _PIDGINGAIM_H_ @@ -39,7 +39,7 @@ /** * Our UI's identifier. */ -#define PIDGIN_UI "gtk-gaim" +#define PIDGIN_UI "pidgin" #ifndef _WIN32 # define GAIM_ALERT_TITLE "" diff --git a/pidgin/plugins/cap/cap.h b/pidgin/plugins/cap/cap.h index 748a1cfa98..d8cc596a90 100644 --- a/pidgin/plugins/cap/cap.h +++ b/pidgin/plugins/cap/cap.h @@ -23,7 +23,7 @@ #define _CAP_H_ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" diff --git a/pidgin/plugins/contact_priority.c b/pidgin/plugins/contact_priority.c index 093628b2f0..243d633442 100644 --- a/pidgin/plugins/contact_priority.c +++ b/pidgin/plugins/contact_priority.c @@ -19,7 +19,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkplugin.h" #include "gtkutils.h" #include "prefs.h" diff --git a/pidgin/plugins/extplacement.c b/pidgin/plugins/extplacement.c index 465c008c35..d19521c00f 100644 --- a/pidgin/plugins/extplacement.c +++ b/pidgin/plugins/extplacement.c @@ -21,7 +21,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "version.h" #include "gtkplugin.h" diff --git a/pidgin/plugins/gestures/gestures.c b/pidgin/plugins/gestures/gestures.c index b8eefe4d35..bca7c935c5 100644 --- a/pidgin/plugins/gestures/gestures.c +++ b/pidgin/plugins/gestures/gestures.c @@ -19,7 +19,7 @@ * 02111-1307, USA. */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "prefs.h" diff --git a/pidgin/plugins/gevolution/add_buddy_dialog.c b/pidgin/plugins/gevolution/add_buddy_dialog.c index 2781333b65..7e90737aff 100644 --- a/pidgin/plugins/gevolution/add_buddy_dialog.c +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c @@ -20,7 +20,7 @@ */ #include "internal.h" #include "gtkblist.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "debug.h" diff --git a/pidgin/plugins/gevolution/assoc-buddy.c b/pidgin/plugins/gevolution/assoc-buddy.c index 8ff2f54646..a449ab4e51 100644 --- a/pidgin/plugins/gevolution/assoc-buddy.c +++ b/pidgin/plugins/gevolution/assoc-buddy.c @@ -21,7 +21,7 @@ #include "internal.h" #include "gtkblist.h" #include "gtkexpander.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "gtkimhtml.h" diff --git a/pidgin/plugins/gevolution/eds-utils.c b/pidgin/plugins/gevolution/eds-utils.c index f28d9c1036..57a4a72f93 100644 --- a/pidgin/plugins/gevolution/eds-utils.c +++ b/pidgin/plugins/gevolution/eds-utils.c @@ -21,7 +21,7 @@ #include "internal.h" #include "gtkblist.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "gtkimhtml.h" diff --git a/pidgin/plugins/gevolution/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c index 489c63b825..87508e03fd 100644 --- a/pidgin/plugins/gevolution/gevo-util.c +++ b/pidgin/plugins/gevolution/gevo-util.c @@ -20,7 +20,7 @@ */ #include "internal.h" #include "gtkblist.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "gevolution.h" diff --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c index 5310530b3c..97fae2760c 100644 --- a/pidgin/plugins/gevolution/gevolution.c +++ b/pidgin/plugins/gevolution/gevolution.c @@ -19,7 +19,7 @@ * 02111-1307, USA. */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "connection.h" #include "debug.h" diff --git a/pidgin/plugins/gevolution/new_person_dialog.c b/pidgin/plugins/gevolution/new_person_dialog.c index 03fb6e31b6..54c66defae 100644 --- a/pidgin/plugins/gevolution/new_person_dialog.c +++ b/pidgin/plugins/gevolution/new_person_dialog.c @@ -19,7 +19,7 @@ * 02111-1307, USA. */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "debug.h" diff --git a/pidgin/plugins/history.c b/pidgin/plugins/history.c index a91949fe4d..52f93ebe4e 100644 --- a/pidgin/plugins/history.c +++ b/pidgin/plugins/history.c @@ -2,7 +2,7 @@ * stolen by Trillian "Pro") */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "debug.h" diff --git a/pidgin/plugins/iconaway.c b/pidgin/plugins/iconaway.c index 8aa72ac337..969ba91415 100644 --- a/pidgin/plugins/iconaway.c +++ b/pidgin/plugins/iconaway.c @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "signals.h" diff --git a/pidgin/plugins/musicmessaging/musicmessaging.c b/pidgin/plugins/musicmessaging/musicmessaging.c index e99abea3f9..739fdcf8fd 100644 --- a/pidgin/plugins/musicmessaging/musicmessaging.c +++ b/pidgin/plugins/musicmessaging/musicmessaging.c @@ -20,7 +20,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c index 3786267b0f..dafdabc768 100644 --- a/pidgin/plugins/notify.c +++ b/pidgin/plugins/notify.c @@ -84,7 +84,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkprefs.h" #include "conversation.h" diff --git a/pidgin/plugins/perl/common/gtkmodule.h b/pidgin/plugins/perl/common/gtkmodule.h index 1373a6911b..9935a94307 100644 --- a/pidgin/plugins/perl/common/gtkmodule.h +++ b/pidgin/plugins/perl/common/gtkmodule.h @@ -73,4 +73,4 @@ typedef GtkIMHtmlToolbar * Gaim__GtkUI__IMHtmlToolbar; typedef PidginMenuTray * Gaim__GtkUI__MenuTray; /* gtkstatusbox.h */ -typedef GtkGaimStatusBox * Gaim__GtkUI__StatusBox; +typedef PidginStatusBox * Gaim__GtkUI__StatusBox; diff --git a/pidgin/plugins/raw.c b/pidgin/plugins/raw.c index fb2069487e..03133a9823 100644 --- a/pidgin/plugins/raw.c +++ b/pidgin/plugins/raw.c @@ -22,7 +22,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "debug.h" diff --git a/pidgin/plugins/relnot.c b/pidgin/plugins/relnot.c index c8c5743d29..a2bc969d3c 100644 --- a/pidgin/plugins/relnot.c +++ b/pidgin/plugins/relnot.c @@ -38,7 +38,7 @@ #include "util.h" #include "version.h" -#include "gtkgaim.h" +#include "pidgin.h" /* 1 day */ #define MIN_CHECK_INTERVAL 60 * 60 * 24 diff --git a/pidgin/plugins/spellchk.c b/pidgin/plugins/spellchk.c index e4006c687c..d65e6278ca 100644 --- a/pidgin/plugins/spellchk.c +++ b/pidgin/plugins/spellchk.c @@ -31,7 +31,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "notify.h" diff --git a/pidgin/plugins/ticker/ticker.c b/pidgin/plugins/ticker/ticker.c index 3e4f346c7d..3e0b7c1478 100644 --- a/pidgin/plugins/ticker/ticker.c +++ b/pidgin/plugins/ticker/ticker.c @@ -25,7 +25,7 @@ * pluginized- Sean Egan, Summer 2002 */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "blist.h" #include "conversation.h" diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c index 025bf3ea54..514bb293ec 100644 --- a/pidgin/win32/gtkwin32dep.c +++ b/pidgin/win32/gtkwin32dep.c @@ -56,7 +56,7 @@ * GLOBALS */ HINSTANCE gaimexe_hInstance = 0; -HINSTANCE gtkgaimdll_hInstance = 0; +HINSTANCE pidgindll_hInstance = 0; HWND messagewin_hwnd; static int gtkwin32_handle; @@ -360,7 +360,7 @@ void gtkwgaim_cleanup(void) { /* DLL initializer */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - gtkgaimdll_hInstance = hinstDLL; + pidgindll_hInstance = hinstDLL; return TRUE; } |