Mercurial > pidgin
changeset 15516:931355dc5462
merge of '40a66b5db866526b5419657ce8971745e4c8baa5'
and '72da69b8fdcabdd4962f91693e1ca459b0634f39'
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Sat, 03 Feb 2007 21:00:04 +0000 |
| parents | e3cbf79af897 (current diff) 3267c1cb5984 (diff) |
| children | 57a97311c76f |
| files | pidgin/gtkgaim.h |
| diffstat | 68 files changed, 626 insertions(+), 626 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gaimstock.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gaimstock.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gaimstock.h"
--- a/pidgin/gaimstock.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gaimstock.h Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- a/pidgin/gtkaccount.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkaccount.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "accountopt.h"
--- a/pidgin/gtkblist.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkblist.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "connection.h" @@ -4331,7 +4331,7 @@ 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 @@ 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);
--- a/pidgin/gtkblist.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkblist.h Sat Feb 03 21:00:04 2007 +0000 @@ -52,7 +52,7 @@ } PidginStatusIconSize; -#include "gtkgaim.h" +#include "pidgin.h" #include "blist.h" /**************************************************************************
--- a/pidgin/gtkconn.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkconn.c Sat Feb 03 21:00:04 2007 +0000 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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;
--- a/pidgin/gtkconv.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkconv.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #ifndef _WIN32 # include <X11/Xlib.h> @@ -6973,7 +6973,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include <gdk/gdkkeysyms.h> @@ -7759,7 +7759,7 @@ #ifdef _WIN32 g_signal_connect(G_OBJECT(win->window), "show", - G_CALLBACK(gtkwgaim_ensure_onscreen), win->window); + G_CALLBACK(winpidgin_ensure_onscreen), win->window); #endif return win;
--- a/pidgin/gtkconv.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkconv.h Sat Feb 03 21:00:04 2007 +0000 @@ -59,7 +59,7 @@ (gaim_conversation_get_ui_ops(conv) == \ pidgin_conversations_get_conv_ui_ops()) -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "gtkconvwin.h"
--- a/pidgin/gtkdebug.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkdebug.c Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- a/pidgin/gtkdialogs.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkdialogs.c Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- a/pidgin/gtkdialogs.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkdialogs.h Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ #ifndef _PIDGINDIALOGS_H_ #define _PIDGINDIALOGS_H_ -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "conversation.h"
--- a/pidgin/gtkdocklet-x11.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Sat Feb 03 21:00:04 2007 +0000 @@ -23,7 +23,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "gaimstock.h"
--- a/pidgin/gtkdocklet.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkdocklet.c Sat Feb 03 21:00:04 2007 +0000 @@ -22,7 +22,7 @@ * 02111-1307, USA. */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "core.h" #include "conversation.h"
--- a/pidgin/gtkft.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkft.c Sat Feb 03 21:00:04 2007 +0000 @@ -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" @@ -881,7 +881,7 @@ #ifdef _WIN32 g_signal_connect(G_OBJECT(dialog->window), "show", - G_CALLBACK(gtkwgaim_ensure_onscreen), dialog->window); + G_CALLBACK(winpidgin_ensure_onscreen), dialog->window); #endif return dialog;
--- a/pidgin/gtkgaim.h Sat Feb 03 20:59:56 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -/** - * @file gtkgaim.h UI definitions and includes - * @ingroup gtkui - * - * gaim - * - * Pidgin is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with this - * source distribution. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * 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*** */ -#ifndef _PIDGINGAIM_H_ -#define _PIDGINGAIM_H_ - -#ifndef _WIN32 -# include <gdk/gdkx.h> -#endif - -#include <gtk/gtk.h> - -#ifdef _WIN32 -# include "gtkwin32dep.h" -#endif - -/** - * Our UI's identifier. - */ -#define PIDGIN_UI "gtk-gaim" - -#ifndef _WIN32 -# define GAIM_ALERT_TITLE "" -#else -# define GAIM_ALERT_TITLE PIDGIN_NAME -#endif - -/* - * This is backwards-compatibility code for older versions of GTK+ (< 2.4.x) - * It defines the new wrap behavior (unknown in earlier versions) - * as the old (slightly buggy) wrap behavior. - * It also includes our back-ported GtkExpander - */ -/** @cond */ -#if (!GTK_CHECK_VERSION(2,4,0)) -#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD -#include "gtkexpander.h" -#endif -/** @endcond */ - -/* - * We include the sources for GtkComboBox and GtkCellView because - * they don't exist in older version of Gtk+, and we use them - * in a few places. - */ -#if !GTK_CHECK_VERSION(2,6,0) -# include "gtkcellview.h" -# include "gtkcellviewmenuitem.h" -# if !GTK_CHECK_VERSION(2,4,0) -# include "gtkcelllayout.h" -# include "gaimcombobox.h" -# endif /* Gtk 2.4 */ -#endif /* Gtk 2.6 */ - -/* - * Spacings between components, as defined by the - * GNOME Human Interface Guidelines. - */ -#define GAIM_HIG_CAT_SPACE 18 -#define GAIM_HIG_BORDER 12 -#define GAIM_HIG_BOX_SPACE 6 - -/* - * See GNOME bug #307304 for some discussion about the invisible - * character. 0x25cf is a good choice, too. - */ -#define GAIM_INVISIBLE_CHAR (gunichar)0x2022 - -#endif /* _PIDGINGAIM_H_ */ -
--- a/pidgin/gtkidle.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkidle.c Sat Feb 03 21:00:04 2007 +0000 @@ -97,7 +97,7 @@ # else # ifdef _WIN32 /* Query Windows */ - return (GetTickCount() - wgaim_get_lastactive()) / 1000; + return (GetTickCount() - winpidgin_get_lastactive()) / 1000; # else /* We're on X11 and not MacOS X with IOKit. */
--- a/pidgin/gtkimhtml.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkimhtml.c Sat Feb 03 21:00:04 2007 +0000 @@ -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
--- a/pidgin/gtkimhtmltoolbar.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "imgstore.h" #include "notify.h"
--- a/pidgin/gtklog.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtklog.c Sat Feb 03 21:00:04 2007 +0000 @@ -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" @@ -169,7 +169,7 @@ #ifdef _WIN32 if (resp == GTK_RESPONSE_HELP) { char *logdir = g_build_filename(gaim_user_dir(), "logs", NULL); - gtkwgaim_shell_execute(logdir, "explore", NULL); + winpidgin_shell_execute(logdir, "explore", NULL); g_free(logdir); return; }
--- a/pidgin/gtklog.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtklog.h Sat Feb 03 21:00:04 2007 +0000 @@ -25,7 +25,7 @@ #ifndef _PIDGINLOG_H_ #define _PIDGINLOG_H_ -#include "gtkgaim.h" +#include "pidgin.h" #include "log.h" #include "account.h"
--- a/pidgin/gtkmain.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkmain.c Sat Feb 03 21:00:04 2007 +0000 @@ -22,7 +22,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "conversation.h" @@ -455,7 +455,7 @@ /* FUCKING GET ME A TOWEL! */ #ifdef _WIN32 -int gaim_main(HINSTANCE hint, int argc, char *argv[]) +int pidgin_main(HINSTANCE hint, int argc, char *argv[]) #else int main(int argc, char *argv[]) #endif @@ -688,7 +688,7 @@ } #ifdef _WIN32 - gtkwgaim_init(hint); + winpidgin_init(hint); #endif gaim_core_set_ui_ops(pidgin_core_get_ui_ops()); @@ -737,7 +737,7 @@ if (!strcmp(gaim_account_get_protocol_id(account), "prpl-oscar")) { if (isdigit(*gaim_account_get_username(account))) gaim_account_set_protocol_id(account, "prpl-icq"); - else + else gaim_account_set_protocol_id(account, "prpl-aim"); } } @@ -811,7 +811,7 @@ #endif #ifdef _WIN32 - gtkwgaim_post_init(); + winpidgin_post_init(); #endif gtk_main(); @@ -821,7 +821,7 @@ #endif #ifdef _WIN32 - gtkwgaim_cleanup(); + winpidgin_cleanup(); #endif return 0;
--- a/pidgin/gtknickcolors.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtknickcolors.h Sat Feb 03 21:00:04 2007 +0000 @@ -25,28 +25,30 @@ #define _PIDGINNICKCOLORS_H_ static GdkColor nick_seed_colors[] = { - {0, 47616, 46336, 43776}, /* Basic 3D Medium */ - {0, 32768, 32000, 29696}, /* Basic 3D Dark */ - {0, 22016, 20992, 18432}, /* 3D Shadow */ - {0, 33536, 42496, 32512}, /* Green Medium */ - {0, 23808, 29952, 21760}, /* Green Dark */ - {0, 17408, 22016, 12800}, /* Green Shadow */ - {0, 57344, 46592, 44800}, /* Red Hilight */ - {0, 49408, 26112, 23040}, /* Red Medium */ - {0, 34816, 17920, 12544}, /* Red Dark */ - {0, 49408, 14336, 8704}, /* Red Shadow */ - {0, 34816, 32512, 41728}, /* Purple Medium */ - {0, 25088, 23296, 33024}, /* Purple Dark */ - {0, 18688, 16384, 26112}, /* Purple Shadow */ - {0, 40192, 47104, 53760}, /* Blue Hilight */ - {0, 29952, 36864, 44544}, /* Blue Medium */ - {0, 57344, 49920, 40448}, /* Face Skin Medium */ - {0, 45824, 37120, 26880}, /* Face skin Dark */ - {0, 33280, 26112, 18176}, /* Face Skin Shadow */ - {0, 57088, 16896, 7680}, /* Accent Red */ - {0, 39168, 0, 0}, /* Accent Red Dark */ - {0, 17920, 40960, 17920}, /* Accent Green */ - {0, 9728, 50944, 9728} /* Accent Green Dark */ + {0, 64764, 59881, 20303}, /* Butter #1 */ + {0, 60909, 54484, 0}, /* Butter #2 */ + {0, 50372, 41120, 0}, /* Butter #3 */ + {0, 64764, 44975, 15934}, /* Orange #1 */ + {0, 62965, 31097, 0}, /* Orange #2 */ + {0, 52942, 23644, 0}, /* Orange #3 */ + {0, 59811, 47545, 28270}, /* Chocolate #1 */ + {0, 49601, 32125, 4369}, /* Chocolate #2 */ + {0, 36751, 22873, 514}, /* Chocolate #3 */ + {0, 35466, 58082, 13364}, /* Chameleon #1 */ + {0, 29555, 53970, 5654}, /* Chameleon #2 */ + {0, 20046, 39578, 1542}, /* Chameleon #3 */ + {0, 29289, 40863, 53199}, /* Sky Blue #1 */ + {0, 13364, 25957, 42148}, /* Sky Blue #2 */ + {0, 8224, 19018, 34695}, /* Sky Blue #3 */ + {0, 44461, 32639, 43167}, /* Plum #1 */ + {0, 30069, 20560, 31611}, /* Plum #2 */ + {0, 23644, 13621, 26214}, /* Plum #3 */ + {0, 61423, 10537, 10537}, /* Scarlet Red #1 */ + {0, 52428, 0, 0}, /* Scarlet Red #2 */ + {0, 42148, 0, 0}, /* Scarlet Red #3 */ + {0, 34952, 35466, 34181}, /* Aluminium #4*/ + {0, 21845, 22359, 21331}, /* Aluminium #5*/ + {0, 11822, 13364, 13878} /* Aluminium #6*/ }; #define NUM_NICK_SEED_COLORS (sizeof(nick_seed_colors) / sizeof(nick_seed_colors[0]))
--- a/pidgin/gtknotify.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtknotify.c Sat Feb 03 21:00:04 2007 +0000 @@ -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> @@ -1086,7 +1086,7 @@ g_free(command); #else /* !_WIN32 */ - gtkwgaim_notify_uri(uri); + winpidgin_notify_uri(uri); #endif /* !_WIN32 */ return NULL;
--- a/pidgin/gtkplugin.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkplugin.c Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- a/pidgin/gtkplugin.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkplugin.h Sat Feb 03 21:00:04 2007 +0000 @@ -25,7 +25,7 @@ #ifndef _PIDGINPLUGIN_H_ #define _PIDGINPLUGIN_H_ -#include "gtkgaim.h" +#include "pidgin.h" #include "plugin.h" typedef struct _PidginPluginUiInfo PidginPluginUiInfo;
--- a/pidgin/gtkpluginpref.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkpluginpref.h Sat Feb 03 21:00:04 2007 +0000 @@ -28,7 +28,7 @@ #include "pluginpref.h" -#include "gtkgaim.h" +#include "pidgin.h" #ifdef __cplusplus extern "C" {
--- a/pidgin/gtkpounce.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkpounce.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "account.h" #include "conversation.h"
--- a/pidgin/gtkprefs.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkprefs.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "notify.h" @@ -491,7 +491,7 @@ g_free(path_escaped); g_free(destdir_escaped); #else - if(!gtkwgaim_gz_untar(path, destdir)) { + if(!winpidgin_gz_untar(path, destdir)) { g_free(destdir); return; }
--- a/pidgin/gtkprivacy.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkprivacy.c Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- a/pidgin/gtkrequest.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkrequest.c Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- a/pidgin/gtkroomlist.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkroomlist.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "gaimstock.h" #include "debug.h"
--- a/pidgin/gtksavedstatuses.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Sat Feb 03 21:00:04 2007 +0000 @@ -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 @@ /* 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;
--- a/pidgin/gtkscrollbook.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkscrollbook.c Sat Feb 03 21:00:04 2007 +0000 @@ -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 @@ { 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 @@ } 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 @@ } 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 @@ } 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 @@ 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 @@ } 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 @@ } 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 @@ 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); }
--- a/pidgin/gtkscrollbook.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkscrollbook.h Sat Feb 03 21:00:04 2007 +0000 @@ -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 _GtkGaimScrollBookClass +struct _PidginScrollBookClass { GtkComboBoxClass parent_class; @@ -75,9 +75,9 @@ }; -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__ */
--- a/pidgin/gtksound.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtksound.c Sat Feb 03 21:00:04 2007 +0000 @@ -24,7 +24,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #ifdef _WIN32 #include <windows.h>
--- a/pidgin/gtkstatusbox.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sat Feb 03 21:00:04 2007 +0000 @@ -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 remove_typing_cb(PidginStatusBox *box); +static void update_size (PidginStatusBox *box); +static gint get_statusbox_index(PidginStatusBox *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 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 @@ 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 @@ { 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 @@ } 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 @@ } 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 @@ 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 @@ } 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 @@ 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 @@ 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 @@ } 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 void -setup_icon_box(GtkGaimStatusBox *status_box) +setup_icon_box(PidginStatusBox *status_box) { if (status_box->icon_box != NULL) return; @@ -334,12 +334,12 @@ !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 @@ } static void -destroy_icon_box(GtkGaimStatusBox *statusbox) +destroy_icon_box(PidginStatusBox *statusbox) { if (statusbox->icon_box == NULL) return; @@ -394,10 +394,10 @@ } 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 @@ 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 @@ } 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 @@ } 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 @@ 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 @@ * 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 @@ 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 @@ 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 @@ /* 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 @@ * 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 @@ 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 @@ /* 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 @@ } 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 @@ } static void -add_popular_statuses(GtkGaimStatusBox *statusbox) +add_popular_statuses(PidginStatusBox *statusbox) { GtkIconSize icon_size; GList *list, *cur; @@ -848,7 +848,7 @@ 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 @@ #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 @@ #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 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 @@ 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 @@ } 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ #endif static void -cache_pixbufs(GtkGaimStatusBox *status_box) +cache_pixbufs(PidginStatusBox *status_box) { GtkIconSize icon_size; @@ -1190,23 +1190,23 @@ 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 @@ 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 @@ } #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 @@ 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 @@ #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 @@ 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 @@ } 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 @@ 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 @@ } 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 @@ } } } - 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ } 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 @@ 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 @@ } 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 @@ } 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 @@ 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 @@ } 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 @@ } 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 @@ } 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 @@ * 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 @@ * 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 @@ } 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_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 @@ } 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 @@ 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 @@ } 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 @@ * 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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));
--- a/pidgin/gtkstatusbox.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkstatusbox.h Sat Feb 03 21:00:04 2007 +0000 @@ -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 @@ */ 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; + 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 _GtkGaimStatusBox GtkGaimStatusBox; -typedef struct _GtkGaimStatusBoxClass GtkGaimStatusBoxClass; +typedef struct _PidginStatusBox PidginStatusBox; +typedef struct _PidginStatusBoxClass PidginStatusBoxClass; -struct _GtkGaimStatusBox +struct _PidginStatusBox { GtkContainer parent_instance; @@ -140,7 +140,7 @@ GtkTreeRowReference *active_row; }; -struct _GtkGaimStatusBoxClass +struct _PidginStatusBoxClass { GtkContainerClass parent_class; @@ -155,32 +155,32 @@ }; -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
--- a/pidgin/gtkthemes.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkthemes.c Sat Feb 03 21:00:04 2007 +0000 @@ -21,7 +21,7 @@ * */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "debug.h"
--- a/pidgin/gtkutils.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkutils.c Sat Feb 03 21:00:04 2007 +0000 @@ -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> @@ -2889,7 +2889,7 @@ #if GTK_CHECK_VERSION(2,8,0) gtk_window_set_urgency_hint(window, urgent); #elif defined _WIN32 - gtkwgaim_window_flash(window, urgent); + winpidgin_window_flash(window, urgent); #else GdkWindow *gdkwin; XWMHints *hints;
--- a/pidgin/gtkutils.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkutils.h Sat Feb 03 21:00:04 2007 +0000 @@ -26,7 +26,7 @@ #define _PIDGINUTILS_H_ #include "gtkconv.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "prpl.h" #include "util.h"
--- a/pidgin/gtkwhiteboard.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/gtkwhiteboard.h Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pidgin.h Sat Feb 03 21:00:04 2007 +0000 @@ -0,0 +1,92 @@ +/** + * @file pidgin.h UI definitions and includes + * @ingroup gtkui + * + * gaim + * + * Pidgin is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* #warning ***pidgin*** */ +#ifndef _PIDGINGAIM_H_ +#define _PIDGINGAIM_H_ + +#ifndef _WIN32 +# include <gdk/gdkx.h> +#endif + +#include <gtk/gtk.h> + +#ifdef _WIN32 +# include "gtkwin32dep.h" +#endif + +/** + * Our UI's identifier. + */ +#define PIDGIN_UI "pidgin" + +#ifndef _WIN32 +# define GAIM_ALERT_TITLE "" +#else +# define GAIM_ALERT_TITLE PIDGIN_NAME +#endif + +/* + * This is backwards-compatibility code for older versions of GTK+ (< 2.4.x) + * It defines the new wrap behavior (unknown in earlier versions) + * as the old (slightly buggy) wrap behavior. + * It also includes our back-ported GtkExpander + */ +/** @cond */ +#if (!GTK_CHECK_VERSION(2,4,0)) +#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD +#include "gtkexpander.h" +#endif +/** @endcond */ + +/* + * We include the sources for GtkComboBox and GtkCellView because + * they don't exist in older version of Gtk+, and we use them + * in a few places. + */ +#if !GTK_CHECK_VERSION(2,6,0) +# include "gtkcellview.h" +# include "gtkcellviewmenuitem.h" +# if !GTK_CHECK_VERSION(2,4,0) +# include "gtkcelllayout.h" +# include "gaimcombobox.h" +# endif /* Gtk 2.4 */ +#endif /* Gtk 2.6 */ + +/* + * Spacings between components, as defined by the + * GNOME Human Interface Guidelines. + */ +#define GAIM_HIG_CAT_SPACE 18 +#define GAIM_HIG_BORDER 12 +#define GAIM_HIG_BOX_SPACE 6 + +/* + * See GNOME bug #307304 for some discussion about the invisible + * character. 0x25cf is a good choice, too. + */ +#define GAIM_INVISIBLE_CHAR (gunichar)0x2022 + +#endif /* _PIDGINGAIM_H_ */ +
--- a/pidgin/plugins/cap/cap.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/cap/cap.h Sat Feb 03 21:00:04 2007 +0000 @@ -23,7 +23,7 @@ #define _CAP_H_ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h"
--- a/pidgin/plugins/contact_priority.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/contact_priority.c Sat Feb 03 21:00:04 2007 +0000 @@ -19,7 +19,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkplugin.h" #include "gtkutils.h" #include "prefs.h"
--- a/pidgin/plugins/extplacement.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/extplacement.c Sat Feb 03 21:00:04 2007 +0000 @@ -21,7 +21,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "version.h" #include "gtkplugin.h"
--- a/pidgin/plugins/gestures/gestures.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/gestures/gestures.c Sat Feb 03 21:00:04 2007 +0000 @@ -19,7 +19,7 @@ * 02111-1307, USA. */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "prefs.h"
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Sat Feb 03 21:00:04 2007 +0000 @@ -20,7 +20,7 @@ */ #include "internal.h" #include "gtkblist.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "debug.h"
--- a/pidgin/plugins/gevolution/assoc-buddy.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/gevolution/assoc-buddy.c Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- a/pidgin/plugins/gevolution/eds-utils.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/gevolution/eds-utils.c Sat Feb 03 21:00:04 2007 +0000 @@ -21,7 +21,7 @@ #include "internal.h" #include "gtkblist.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "gtkimhtml.h"
--- a/pidgin/plugins/gevolution/gevo-util.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/gevolution/gevo-util.c Sat Feb 03 21:00:04 2007 +0000 @@ -20,7 +20,7 @@ */ #include "internal.h" #include "gtkblist.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "gevolution.h"
--- a/pidgin/plugins/gevolution/gevolution.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Sat Feb 03 21:00:04 2007 +0000 @@ -19,7 +19,7 @@ * 02111-1307, USA. */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "connection.h" #include "debug.h"
--- a/pidgin/plugins/gevolution/new_person_dialog.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/gevolution/new_person_dialog.c Sat Feb 03 21:00:04 2007 +0000 @@ -19,7 +19,7 @@ * 02111-1307, USA. */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkutils.h" #include "debug.h"
--- a/pidgin/plugins/history.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/history.c Sat Feb 03 21:00:04 2007 +0000 @@ -2,7 +2,7 @@ * stolen by Trillian "Pro") */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "debug.h"
--- a/pidgin/plugins/iconaway.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/iconaway.c Sat Feb 03 21:00:04 2007 +0000 @@ -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"
--- a/pidgin/plugins/musicmessaging/musicmessaging.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Sat Feb 03 21:00:04 2007 +0000 @@ -20,7 +20,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h"
--- a/pidgin/plugins/notify.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/notify.c Sat Feb 03 21:00:04 2007 +0000 @@ -84,7 +84,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "gtkprefs.h" #include "conversation.h"
--- a/pidgin/plugins/perl/common/gtkmodule.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/perl/common/gtkmodule.h Sat Feb 03 21:00:04 2007 +0000 @@ -73,4 +73,4 @@ typedef PidginMenuTray * Gaim__GtkUI__MenuTray; /* gtkstatusbox.h */ -typedef GtkGaimStatusBox * Gaim__GtkUI__StatusBox; +typedef PidginStatusBox * Gaim__GtkUI__StatusBox;
--- a/pidgin/plugins/raw.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/raw.c Sat Feb 03 21:00:04 2007 +0000 @@ -22,7 +22,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "conversation.h" #include "debug.h"
--- a/pidgin/plugins/relnot.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/relnot.c Sat Feb 03 21:00:04 2007 +0000 @@ -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
--- a/pidgin/plugins/spellchk.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/spellchk.c Sat Feb 03 21:00:04 2007 +0000 @@ -31,7 +31,7 @@ */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "debug.h" #include "notify.h"
--- a/pidgin/plugins/ticker/ticker.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/ticker/ticker.c Sat Feb 03 21:00:04 2007 +0000 @@ -25,7 +25,7 @@ * pluginized- Sean Egan, Summer 2002 */ #include "internal.h" -#include "gtkgaim.h" +#include "pidgin.h" #include "blist.h" #include "conversation.h"
--- a/pidgin/plugins/win32/winprefs/winprefs.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/winprefs.c Sat Feb 03 21:00:04 2007 +0000 @@ -234,11 +234,11 @@ } static gboolean -gtkwgaim_conv_chat_blink(GaimAccount *account, const char *who, char **message, +winpidgin_conv_chat_blink(GaimAccount *account, const char *who, char **message, GaimConversation *conv, GaimMessageFlags flags, void *data) { if(gaim_prefs_get_bool(PREF_CHAT_BLINK)) - gtkwgaim_conv_blink(conv, flags); + winpidgin_conv_blink(conv, flags); return FALSE; } @@ -263,7 +263,7 @@ plugin, GAIM_CALLBACK(blist_create_cb), NULL); gaim_signal_connect(pidgin_conversations_get_handle(), - "displaying-chat-msg", plugin, GAIM_CALLBACK(gtkwgaim_conv_chat_blink), + "displaying-chat-msg", plugin, GAIM_CALLBACK(winpidgin_conv_chat_blink), NULL); gaim_signal_connect((void*)gaim_get_core(), "quitting", plugin,
--- a/pidgin/win32/IdleTracker/idletrack.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/win32/IdleTracker/idletrack.c Sat Feb 03 21:00:04 2007 +0000 @@ -99,7 +99,7 @@ } -EXPORT DWORD wgaim_get_lastactive() { +EXPORT DWORD winpidgin_get_lastactive() { DWORD result = 0; /* If we have GetLastInputInfo then use it, otherwise use the hooks*/ @@ -122,7 +122,7 @@ } -EXPORT BOOL wgaim_set_idlehooks() { +EXPORT BOOL winpidgin_set_idlehooks() { /* Is GetLastInputInfo available?*/ g_user32 = LoadLibrary("user32.dll"); if(g_user32) { @@ -159,7 +159,7 @@ } -EXPORT void wgaim_remove_idlehooks() { +EXPORT void winpidgin_remove_idlehooks() { if(g_user32 != NULL) FreeLibrary(g_user32); if(keyHook)
--- a/pidgin/win32/IdleTracker/idletrack.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/win32/IdleTracker/idletrack.h Sat Feb 03 21:00:04 2007 +0000 @@ -3,6 +3,6 @@ */ #include <windows.h> -DWORD wgaim_get_lastactive(void); -BOOL wgaim_set_idlehooks(void); -void wgaim_remove_idlehooks(void); +DWORD winpidgin_get_lastactive(void); +BOOL winpidgin_set_idlehooks(void); +void winpidgin_remove_idlehooks(void);
--- a/pidgin/win32/gtkdocklet-win32.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Sat Feb 03 21:00:04 2007 +0000 @@ -1,11 +1,11 @@ /* - * System tray icon (aka docklet) plugin for Gaim + * System tray icon (aka docklet) plugin for Winpidgin * * Copyright (C) 2002-3 Robert McQueen <robot101@debian.org> * Copyright (C) 2003 Herman Bloggs <hermanator12002@yahoo.com> * Inspired by a similar plugin by: * John (J5) Palmieri <johnp@martianrock.com> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the @@ -15,7 +15,7 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -50,8 +50,7 @@ static HICON sysicon_pend = 0; static HICON sysicon_awypend = 0; static HICON sysicon_blank = 0; -static NOTIFYICONDATA wgaim_nid; - +static NOTIFYICONDATA _nicon_data; static LRESULT CALLBACK systray_mainmsg_handler(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static UINT taskbarRestartMsg; /* static here means value is kept across multiple calls to this func */ @@ -91,7 +90,7 @@ if (msg == taskbarRestartMsg) { /* explorer crashed and left us hanging... This will put the systray icon back in it's place, when it restarts */ - Shell_NotifyIcon(NIM_ADD, &wgaim_nid); + Shell_NotifyIcon(NIM_ADD, &_nicon_data); } break; }/* end switch */ @@ -104,7 +103,7 @@ WNDCLASSEX wcex; LPCTSTR wname; - wname = TEXT("WingaimSystrayWinCls"); + wname = TEXT("WinpidginSystrayWinCls"); wcex.cbSize = sizeof(wcex); @@ -112,7 +111,7 @@ wcex.lpfnWndProc = systray_mainmsg_handler; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; - wcex.hInstance = gtkwgaim_hinstance(); + wcex.hInstance = winpidgin_hinstance(); wcex.hIcon = NULL; wcex.hCursor = NULL, wcex.hbrBackground = NULL; @@ -123,32 +122,32 @@ RegisterClassEx(&wcex); /* Create the window */ - return (CreateWindow(wname, "", 0, 0, 0, 0, 0, GetDesktopWindow(), NULL, gtkwgaim_hinstance(), 0)); + return (CreateWindow(wname, "", 0, 0, 0, 0, 0, GetDesktopWindow(), NULL, winpidgin_hinstance(), 0)); } static void systray_init_icon(HWND hWnd, HICON icon) { - ZeroMemory(&wgaim_nid, sizeof(wgaim_nid)); - wgaim_nid.cbSize = sizeof(NOTIFYICONDATA); - wgaim_nid.hWnd = hWnd; - wgaim_nid.uID = 0; - wgaim_nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; - wgaim_nid.uCallbackMessage = WM_TRAYMESSAGE; - wgaim_nid.hIcon = icon; - lstrcpy(wgaim_nid.szTip, PIDGIN_NAME); - Shell_NotifyIcon(NIM_ADD, &wgaim_nid); + ZeroMemory(&_nicon_data, sizeof(_nicon_data)); + _nicon_data.cbSize = sizeof(NOTIFYICONDATA); + _nicon_data.hWnd = hWnd; + _nicon_data.uID = 0; + _nicon_data.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; + _nicon_data.uCallbackMessage = WM_TRAYMESSAGE; + _nicon_data.hIcon = icon; + lstrcpy(_nicon_data.szTip, PIDGIN_NAME); + Shell_NotifyIcon(NIM_ADD, &_nicon_data); pidgin_docklet_embedded(); } static void systray_change_icon(HICON icon) { - wgaim_nid.hIcon = icon; - Shell_NotifyIcon(NIM_MODIFY, &wgaim_nid); + _nicon_data.hIcon = icon; + Shell_NotifyIcon(NIM_MODIFY, &_nicon_data); } static void systray_remove_nid(void) { - Shell_NotifyIcon(NIM_DELETE, &wgaim_nid); + Shell_NotifyIcon(NIM_DELETE, &_nicon_data); } -static void wgaim_tray_update_icon(DockletStatus icon) { +static void winpidgin_tray_update_icon(DockletStatus icon) { switch (icon) { case DOCKLET_STATUS_OFFLINE: systray_change_icon(sysicon_disconn); @@ -170,32 +169,32 @@ } } -static void wgaim_tray_blank_icon() { +static void winpidgin_tray_blank_icon() { systray_change_icon(sysicon_blank); } -static void wgaim_tray_set_tooltip(gchar *tooltip) { +static void winpidgin_tray_set_tooltip(gchar *tooltip) { if (tooltip) { char *locenc = NULL; locenc = g_locale_from_utf8(tooltip, -1, NULL, NULL, NULL); - lstrcpyn(wgaim_nid.szTip, locenc, sizeof(wgaim_nid.szTip) / sizeof(TCHAR)); + lstrcpyn(_nicon_data.szTip, locenc, sizeof(_nicon_data.szTip) / sizeof(TCHAR)); g_free(locenc); } else { - lstrcpy(wgaim_nid.szTip, PIDGIN_NAME); + lstrcpy(_nicon_data.szTip, PIDGIN_NAME); } - Shell_NotifyIcon(NIM_MODIFY, &wgaim_nid); + Shell_NotifyIcon(NIM_MODIFY, &_nicon_data); } -static void wgaim_tray_minimize(PidginBuddyList *gtkblist) { +static void winpidgin_tray_minimize(PidginBuddyList *gtkblist) { MinimizeWndToTray(GDK_WINDOW_HWND(gtkblist->window->window)); } -static void wgaim_tray_maximize(PidginBuddyList *gtkblist) { +static void winpidgin_tray_maximize(PidginBuddyList *gtkblist) { RestoreWndFromTray(GDK_WINDOW_HWND(gtkblist->window->window)); } -static void wgaim_tray_create() { +static void winpidgin_tray_create() { OSVERSIONINFO osinfo; /* dummy window to process systray messages */ systray_hwnd = systray_create_hiddenwin(); @@ -211,48 +210,48 @@ if ((osinfo.dwMajorVersion == 5 && osinfo.dwMinorVersion > 0) || (osinfo.dwMajorVersion >= 6)) { - sysicon_disconn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON), IMAGE_ICON, 16, 16, 0); - sysicon_conn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON), IMAGE_ICON, 16, 16, 0); - sysicon_away = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON), IMAGE_ICON, 16, 16, 0); - sysicon_pend = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_PEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0); - sysicon_awypend = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAYPEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0); + sysicon_disconn = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON), IMAGE_ICON, 16, 16, 0); + sysicon_conn = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON), IMAGE_ICON, 16, 16, 0); + sysicon_away = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON), IMAGE_ICON, 16, 16, 0); + sysicon_pend = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_PEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0); + sysicon_awypend = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_AWAYPEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0); } else { - sysicon_disconn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); - sysicon_conn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); - sysicon_away = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); - sysicon_pend = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_PEND_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); - sysicon_awypend = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAYPEND_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); + sysicon_disconn = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); + sysicon_conn = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); + sysicon_away = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); + sysicon_pend = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_PEND_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); + sysicon_awypend = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_AWAYPEND_TRAY_ICON_4BIT), IMAGE_ICON, 16, 16, 0); } - sysicon_blank = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_BLANK_TRAY_ICON), IMAGE_ICON, 16, 16, 0); + sysicon_blank = (HICON)LoadImage(winpidgin_hinstance(), MAKEINTRESOURCE(GAIM_BLANK_TRAY_ICON), IMAGE_ICON, 16, 16, 0); /* Create icon in systray */ systray_init_icon(systray_hwnd, sysicon_disconn); gaim_signal_connect(pidgin_blist_get_handle(), "gtkblist-hiding", - pidgin_docklet_get_handle(), GAIM_CALLBACK(wgaim_tray_minimize), NULL); + pidgin_docklet_get_handle(), GAIM_CALLBACK(winpidgin_tray_minimize), NULL); gaim_signal_connect(pidgin_blist_get_handle(), "gtkblist-unhiding", - pidgin_docklet_get_handle(), GAIM_CALLBACK(wgaim_tray_maximize), NULL); + pidgin_docklet_get_handle(), GAIM_CALLBACK(winpidgin_tray_maximize), NULL); gaim_debug(GAIM_DEBUG_INFO, "docklet", "created\n"); } -static void wgaim_tray_destroy() { +static void winpidgin_tray_destroy() { systray_remove_nid(); DestroyWindow(systray_hwnd); pidgin_docklet_remove(); } -static struct docklet_ui_ops wgaim_tray_ops = +static struct docklet_ui_ops winpidgin_tray_ops = { - wgaim_tray_create, - wgaim_tray_destroy, - wgaim_tray_update_icon, - wgaim_tray_blank_icon, - wgaim_tray_set_tooltip, + winpidgin_tray_create, + winpidgin_tray_destroy, + winpidgin_tray_update_icon, + winpidgin_tray_blank_icon, + winpidgin_tray_set_tooltip, NULL }; /* Used by docklet's plugin load func */ void docklet_ui_init() { - pidgin_docklet_set_ui_ops(&wgaim_tray_ops); + pidgin_docklet_set_ui_ops(&winpidgin_tray_ops); }
--- a/pidgin/win32/gtkwin32dep.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/win32/gtkwin32dep.c Sat Feb 03 21:00:04 2007 +0000 @@ -1,11 +1,10 @@ -/* - * gaim +/** + * @file gtkwin32dep.c UI Win32 Specific Functionality + * @ingroup win32 * - * File: gtkwin32dep.c - * Date: June, 2002 - * Description: Windows dependant code for Gaim - * - * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com> + * Pidgin is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -55,8 +54,8 @@ /* * GLOBALS */ -HINSTANCE gaimexe_hInstance = 0; -HINSTANCE gtkgaimdll_hInstance = 0; +HINSTANCE exe_hInstance = 0; +HINSTANCE dll_hInstance = 0; HWND messagewin_hwnd; static int gtkwin32_handle; @@ -68,11 +67,11 @@ * PUBLIC CODE */ -HINSTANCE gtkwgaim_hinstance(void) { - return gaimexe_hInstance; +HINSTANCE winpidgin_hinstance(void) { + return exe_hInstance; } -int gtkwgaim_gz_decompress(const char* in, const char* out) { +int winpidgin_gz_decompress(const char* in, const char* out) { gzFile fin; FILE *fout; char buf[1024]; @@ -80,13 +79,13 @@ if((fin = gzopen(in, "rb"))) { if(!(fout = g_fopen(out, "wb"))) { - gaim_debug_error("gtkwgaim_gz_decompress", "Error opening file: %s\n", out); + gaim_debug_error("winpidgin_gz_decompress", "Error opening file: %s\n", out); gzclose(fin); return 0; } } else { - gaim_debug_error("gtkwgaim_gz_decompress", "gzopen failed to open: %s\n", in); + gaim_debug_error("winpidgin_gz_decompress", "gzopen failed to open: %s\n", in); return 0; } @@ -102,36 +101,36 @@ gzclose(fin); if(ret < 0) { - gaim_debug_error("gtkwgaim_gz_decompress", "gzread failed while reading: %s\n", in); + gaim_debug_error("winpidgin_gz_decompress", "gzread failed while reading: %s\n", in); return 0; } return 1; } -int gtkwgaim_gz_untar(const char* filename, const char* destdir) { +int winpidgin_gz_untar(const char* filename, const char* destdir) { char tmpfile[_MAX_PATH]; - char template[]="wgaimXXXXXX"; + char template[]="wpidginXXXXXX"; sprintf(tmpfile, "%s%s%s", g_get_tmp_dir(), G_DIR_SEPARATOR_S, _mktemp(template)); - if(gtkwgaim_gz_decompress(filename, tmpfile)) { + if(winpidgin_gz_decompress(filename, tmpfile)) { int ret; if(untar(tmpfile, destdir, UNTAR_FORCE | UNTAR_QUIET)) ret = 1; else { - gaim_debug_error("gtkwgaim_gz_untar", "Failure untarring %s\n", tmpfile); + gaim_debug_error("winpidgin_gz_untar", "Failure untarring %s\n", tmpfile); ret = 0; } g_unlink(tmpfile); return ret; } else { - gaim_debug_error("gtkwgaim_gz_untar", "Failed to gz decompress %s\n", filename); + gaim_debug_error("winpidgin_gz_untar", "Failed to gz decompress %s\n", filename); return 0; } } -void gtkwgaim_shell_execute(const char *target, const char *verb, const char *clazz) { +void winpidgin_shell_execute(const char *target, const char *verb, const char *clazz) { g_return_if_fail(target != NULL); g_return_if_fail(verb != NULL); @@ -155,7 +154,7 @@ } if(!ShellExecuteExW(&wsinfo)) - gaim_debug_error("gtkwgaim", "Error opening URI: %s error: %d\n", + gaim_debug_error("winpidgin", "Error opening URI: %s error: %d\n", target, (int) wsinfo.hInstApp); g_free(w_uri); @@ -178,7 +177,7 @@ } if(!ShellExecuteExA(&sinfo)) - gaim_debug_error("gtkwgaim", "Error opening URI: %s error: %d\n", + gaim_debug_error("winpidgin", "Error opening URI: %s error: %d\n", target, (int) sinfo.hInstApp); g_free(locale_uri); @@ -186,11 +185,11 @@ } -void gtkwgaim_notify_uri(const char *uri) { +void winpidgin_notify_uri(const char *uri) { /* We'll allow whatever URI schemes are supported by the * default http browser. */ - gtkwgaim_shell_execute(uri, "open", "http"); + winpidgin_shell_execute(uri, "open", "http"); } #define WM_FOCUS_REQUEST (WM_APP + 13) @@ -198,7 +197,7 @@ static LRESULT CALLBACK message_window_handler(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { if (msg == WM_FOCUS_REQUEST) { - gaim_debug_info("gtkwgaim", "Got external Buddy List focus request."); + gaim_debug_info("winpidgin", "Got external Buddy List focus request."); gaim_blist_set_visible(TRUE); return TRUE; } @@ -206,19 +205,19 @@ return DefWindowProc(hwnd, msg, wparam, lparam); } -static HWND wgaim_message_window_init(void) { +static HWND winpidgin_message_window_init(void) { HWND win_hwnd; WNDCLASSEX wcx; LPCTSTR wname; - wname = TEXT("WingaimMsgWinCls"); + wname = TEXT("WinpidginMsgWinCls"); wcx.cbSize = sizeof(wcx); wcx.style = 0; wcx.lpfnWndProc = message_window_handler; wcx.cbClsExtra = 0; wcx.cbWndExtra = 0; - wcx.hInstance = gtkwgaim_hinstance(); + wcx.hInstance = winpidgin_hinstance(); wcx.hIcon = NULL; wcx.hCursor = NULL; wcx.hbrBackground = NULL; @@ -229,9 +228,9 @@ RegisterClassEx(&wcx); /* Create the window */ - if(!(win_hwnd = CreateWindow(wname, TEXT("WingaimMsgWin"), 0, 0, 0, 0, 0, - NULL, NULL, gtkwgaim_hinstance(), 0))) { - gaim_debug_error("gtkwgaim", + if(!(win_hwnd = CreateWindow(wname, TEXT("WinpidginMsgWin"), 0, 0, 0, 0, 0, + NULL, NULL, winpidgin_hinstance(), 0))) { + gaim_debug_error("winpidgin", "Unable to create message window.\n"); return NULL; } @@ -241,12 +240,12 @@ static gboolean stop_flashing(GtkWidget *widget, GdkEventFocus *event, gpointer data) { GtkWindow *window = data; - gtkwgaim_window_flash(window, FALSE); + winpidgin_window_flash(window, FALSE); return FALSE; } void -gtkwgaim_window_flash(GtkWindow *window, gboolean flash) { +winpidgin_window_flash(GtkWindow *window, gboolean flash) { GdkWindow * gdkwin; g_return_if_fail(window != NULL); @@ -278,7 +277,7 @@ } void -gtkwgaim_conv_blink(GaimConversation *conv, GaimMessageFlags flags) { +winpidgin_conv_blink(GaimConversation *conv, GaimMessageFlags flags) { PidginWindow *win; GtkWindow *window; @@ -287,99 +286,99 @@ return; if(conv == NULL) { - gaim_debug_info("gtkwgaim", "No conversation found to blink.\n"); + gaim_debug_info("winpidgin", "No conversation found to blink.\n"); return; } win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv)); if(win == NULL) { - gaim_debug_info("gtkwgaim", "No conversation windows found to blink.\n"); + gaim_debug_info("winpidgin", "No conversation windows found to blink.\n"); return; } window = GTK_WINDOW(win->window); - gtkwgaim_window_flash(window, TRUE); + winpidgin_window_flash(window, TRUE); /* Stop flashing when window receives focus */ g_signal_connect(G_OBJECT(window), "focus-in-event", G_CALLBACK(stop_flashing), window); } static gboolean -gtkwgaim_conv_im_blink(GaimAccount *account, const char *who, char **message, +winpidgin_conv_im_blink(GaimAccount *account, const char *who, char **message, GaimConversation *conv, GaimMessageFlags flags, void *data) { if (gaim_prefs_get_bool("/gaim/gtk/win32/blink_im")) - gtkwgaim_conv_blink(conv, flags); + winpidgin_conv_blink(conv, flags); return FALSE; } -void gtkwgaim_init(HINSTANCE hint) { +void winpidgin_init(HINSTANCE hint) { - gaim_debug_info("gtkwgaim", "gtkwgaim_init start\n"); + gaim_debug_info("winpidgin", "winpidgin_init start\n"); - gaimexe_hInstance = hint; + exe_hInstance = hint; /* IdleTracker Initialization */ - if(!wgaim_set_idlehooks()) - gaim_debug_error("gtkwgaim", "Failed to initialize idle tracker\n"); + if(!winpidgin_set_idlehooks()) + gaim_debug_error("winpidgin", "Failed to initialize idle tracker\n"); wpidginspell_init(); - gaim_debug_info("gtkwgaim", "GTK+ :%u.%u.%u\n", + gaim_debug_info("winpidgin", "GTK+ :%u.%u.%u\n", gtk_major_version, gtk_minor_version, gtk_micro_version); - messagewin_hwnd = wgaim_message_window_init(); + messagewin_hwnd = winpidgin_message_window_init(); MyFlashWindowEx = (LPFNFLASHWINDOWEX) wgaim_find_and_loadproc("user32.dll", "FlashWindowEx"); - gaim_debug_info("gtkwgaim", "gtkwgaim_init end\n"); + gaim_debug_info("winpidgin", "winpidgin_init end\n"); } -void gtkwgaim_post_init(void) { +void winpidgin_post_init(void) { gaim_prefs_add_none("/gaim/gtk/win32"); gaim_prefs_add_bool("/gaim/gtk/win32/blink_im", TRUE); gaim_signal_connect(pidgin_conversations_get_handle(), - "displaying-im-msg", >kwin32_handle, GAIM_CALLBACK(gtkwgaim_conv_im_blink), + "displaying-im-msg", >kwin32_handle, GAIM_CALLBACK(winpidgin_conv_im_blink), NULL); } /* Windows Cleanup */ -void gtkwgaim_cleanup(void) { - gaim_debug_info("gtkwgaim", "gtkwgaim_cleanup\n"); +void winpidgin_cleanup(void) { + gaim_debug_info("winpidgin", "winpidgin_cleanup\n"); if(messagewin_hwnd) DestroyWindow(messagewin_hwnd); /* Idle tracker cleanup */ - wgaim_remove_idlehooks(); + winpidgin_remove_idlehooks(); } /* DLL initializer */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - gtkgaimdll_hInstance = hinstDLL; + dll_hInstance = hinstDLL; return TRUE; } -typedef HMONITOR WINAPI gaim_MonitorFromWindow(HWND, DWORD); -typedef BOOL WINAPI gaim_GetMonitorInfo(HMONITOR, LPMONITORINFO); +typedef HMONITOR WINAPI _MonitorFromWindow(HWND, DWORD); +typedef BOOL WINAPI _GetMonitorInfo(HMONITOR, LPMONITORINFO); static gboolean get_WorkingAreaRectForWindow(HWND hwnd, RECT *workingAreaRc) { - static gaim_MonitorFromWindow *the_MonitorFromWindow; - static gaim_GetMonitorInfo *the_GetMonitorInfo; + static _MonitorFromWindow *the_MonitorFromWindow; + static _GetMonitorInfo *the_GetMonitorInfo; static gboolean initialized = FALSE; HMONITOR monitor; MONITORINFO info; if(!initialized) { - the_MonitorFromWindow = (gaim_MonitorFromWindow*) + the_MonitorFromWindow = (_MonitorFromWindow*) wgaim_find_and_loadproc("user32", "MonitorFromWindow"); - the_GetMonitorInfo = (gaim_GetMonitorInfo*) + the_GetMonitorInfo = (_GetMonitorInfo*) wgaim_find_and_loadproc("user32", "GetMonitorInfoA"); initialized = TRUE; } @@ -400,7 +399,7 @@ return TRUE; } -void gtkwgaim_ensure_onscreen(GtkWidget *win) { +void winpidgin_ensure_onscreen(GtkWidget *win) { RECT windowRect, workingAreaRect, intersectionRect; HWND hwnd = GDK_WINDOW_HWND(win->window);
--- a/pidgin/win32/gtkwin32dep.h Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/win32/gtkwin32dep.h Sat Feb 03 21:00:04 2007 +0000 @@ -1,9 +1,10 @@ -/* - * gaim +/** + * @file gtkwin32dep.h UI Win32 Specific Functionality + * @ingroup win32 * - * File: win32dep.h - * - * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com> + * Pidgin is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +19,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #ifndef _GTKWIN32DEP_H_ #define _GTKWIN32DEP_H_ @@ -26,23 +26,23 @@ #include <gtk/gtk.h> #include "conversation.h" -HINSTANCE gtkwgaim_hinstance(void); +HINSTANCE winpidgin_hinstance(void); /* Utility */ -int gtkwgaim_gz_decompress(const char* in, const char* out); -int gtkwgaim_gz_untar(const char* filename, const char* destdir); +int winpidgin_gz_decompress(const char* in, const char* out); +int winpidgin_gz_untar(const char* filename, const char* destdir); /* Misc */ -void gtkwgaim_notify_uri(const char *uri); -void gtkwgaim_shell_execute(const char *target, const char *verb, const char *clazz); -void gtkwgaim_ensure_onscreen(GtkWidget *win); -void gtkwgaim_conv_blink(GaimConversation *conv, GaimMessageFlags flags); -void gtkwgaim_window_flash(GtkWindow *window, gboolean flash); +void winpidgin_notify_uri(const char *uri); +void winpidgin_shell_execute(const char *target, const char *verb, const char *clazz); +void winpidgin_ensure_onscreen(GtkWidget *win); +void winpidgin_conv_blink(GaimConversation *conv, GaimMessageFlags flags); +void winpidgin_window_flash(GtkWindow *window, gboolean flash); /* init / cleanup */ -void gtkwgaim_init(HINSTANCE); -void gtkwgaim_post_init(void); -void gtkwgaim_cleanup(void); +void winpidgin_init(HINSTANCE); +void winpidgin_post_init(void); +void winpidgin_cleanup(void); #endif /* _WIN32DEP_H_ */
--- a/pidgin/win32/winpidgin.c Sat Feb 03 20:59:56 2007 +0000 +++ b/pidgin/win32/winpidgin.c Sat Feb 03 21:00:04 2007 +0000 @@ -51,14 +51,14 @@ #endif -typedef int (CALLBACK* LPFNGAIMMAIN)(HINSTANCE, int, char**); +typedef int (CALLBACK* LPFNPIDGINMAIN)(HINSTANCE, int, char**); typedef void (CALLBACK* LPFNSETDLLDIRECTORY)(LPCTSTR); typedef BOOL (CALLBACK* LPFNATTACHCONSOLE)(DWORD); /* * PROTOTYPES */ -static LPFNGAIMMAIN gaim_main = NULL; +static LPFNPIDGINMAIN pidgin_main = NULL; static LPFNSETDLLDIRECTORY MySetDllDirectory = NULL; static const char *get_win32_error_message(DWORD err) { @@ -249,7 +249,7 @@ } } -static char* wgaim_lcid_to_posix(LCID lcid) { +static char* winpidgin_lcid_to_posix(LCID lcid) { char *posix = NULL; int lang_id = PRIMARYLANGID(lcid); int sub_id = SUBLANGID(lcid); @@ -395,7 +395,7 @@ - Check NSIS Installer Language reg value - Use default user locale */ -static const char *wgaim_get_locale() { +static const char *winpidgin_get_locale() { const char *locale = NULL; LCID lcid; #ifndef PORTABLE @@ -410,23 +410,23 @@ #ifndef PORTABLE if (read_reg_string(HKEY_CURRENT_USER, "SOFTWARE\\gaim", "Installer Language", (LPBYTE) &data, &datalen)) { - if ((locale = wgaim_lcid_to_posix(atoi(data)))) + if ((locale = winpidgin_lcid_to_posix(atoi(data)))) return locale; } #endif lcid = GetUserDefaultLCID(); - if ((locale = wgaim_lcid_to_posix(lcid))) + if ((locale = winpidgin_lcid_to_posix(lcid))) return locale; return "en"; } -static void wgaim_set_locale() { +static void winpidgin_set_locale() { const char *locale = NULL; char envstr[25]; - locale = wgaim_get_locale(); + locale = winpidgin_get_locale(); snprintf(envstr, 25, "LANG=%s", locale); printf("Setting locale: %s\n", envstr); @@ -435,21 +435,21 @@ #define WM_FOCUS_REQUEST (WM_APP + 13) -static BOOL wgaim_set_running() { +static BOOL winpidgin_set_running() { HANDLE h; - if ((h = CreateMutex(NULL, FALSE, "gaim_is_running"))) { + if ((h = CreateMutex(NULL, FALSE, "pidgin_is_running"))) { if (GetLastError() == ERROR_ALREADY_EXISTS) { HWND msg_win; - if((msg_win = FindWindow(TEXT("WingaimMsgWinCls"), NULL))) + if((msg_win = FindWindow(TEXT("WinpidginMsgWinCls"), NULL))) if(SendMessage(msg_win, WM_FOCUS_REQUEST, (WPARAM) NULL, (LPARAM) NULL)) return FALSE; /* If we get here, the focus request wasn't successful */ MessageBox(NULL, - "An instance of Gaim is already running", + "An instance of Pidgin is already running", NULL, MB_OK | MB_TOPMOST); return FALSE; @@ -469,7 +469,7 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance, char *lpszCmdLine, int nCmdShow) { char errbuf[512]; - char gaimdir[MAX_PATH]; + char pidgindir[MAX_PATH]; HMODULE hmod; /* If debug or help or version flag used, create console for output */ @@ -492,8 +492,8 @@ } /* Load exception handler if we have it */ - if (GetModuleFileName(NULL, gaimdir, MAX_PATH) != 0) { - char *tmp = gaimdir; + if (GetModuleFileName(NULL, pidgindir, MAX_PATH) != 0) { + char *tmp = pidgindir; char *prev = NULL; while ((tmp = strchr(tmp, '\\'))) { @@ -503,8 +503,8 @@ if (prev) { prev[0] = '\0'; - strcat(gaimdir, "\\exchndl.dll"); - if (LoadLibrary(gaimdir)) + strcat(pidgindir, "\\exchndl.dll"); + if (LoadLibrary(pidgindir)) printf("Loaded exchndl.dll\n"); } } else { @@ -522,18 +522,18 @@ #endif dll_prep(); - wgaim_set_locale(); + winpidgin_set_locale(); /* If help or version flag used, do not check Mutex */ if (!strstr(lpszCmdLine, "-h") && !strstr(lpszCmdLine, "-v")) - if (!getenv("GAIM_MULTI_INST") && !wgaim_set_running()) + if (!getenv("GAIM_MULTI_INST") && !winpidgin_set_running()) return 0; /* Now we are ready for Gaim .. */ if ((hmod = LoadLibrary("pidgin.dll"))) { - gaim_main = (LPFNGAIMMAIN) GetProcAddress(hmod, "gaim_main"); + pidgin_main = (LPFNPIDGINMAIN) GetProcAddress(hmod, "pidgin_main"); } - if (!gaim_main) { + if (!pidgin_main) { DWORD dw = GetLastError(); BOOL mod_not_found = (dw == ERROR_MOD_NOT_FOUND || dw == ERROR_DLL_NOT_FOUND); const char *err_msg = get_win32_error_message(dw); @@ -548,5 +548,5 @@ return 0; } - return gaim_main (hInstance, __argc, __argv); + return pidgin_main(hInstance, __argc, __argv); }