Mercurial > pidgin.yaz
changeset 5248:d635e8fe2fba
[gaim-migrate @ 5620]
Just cleaning up some loose ends. This should fix compilation on Windows
oxen. How do you peeps feel about the TOMBSTONE thing? I just like
using that word. "TOBMSTONE."
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 28 Apr 2003 06:11:49 +0000 |
| parents | 60983a46700e |
| children | 98fc2d44c2ba |
| files | plugins/win32/transparency/win2ktrans.c src/Makefile.mingw src/gaim.h src/gaimrc.c src/gtkblist.h src/prefs.c src/server.c src/win32/systray.c |
| diffstat | 8 files changed, 13 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/win32/transparency/win2ktrans.c Mon Apr 28 02:41:00 2003 +0000 +++ b/plugins/win32/transparency/win2ktrans.c Mon Apr 28 06:11:49 2003 +0000 @@ -24,7 +24,7 @@ #include <gmodule.h> #include "gaim.h" #include "gtkplugin.h" -#include "gtklist.h" +#include "gtkblist.h" #include "win32dep.h" /*
--- a/src/Makefile.mingw Mon Apr 28 02:41:00 2003 +0000 +++ b/src/Makefile.mingw Mon Apr 28 06:11:49 2003 +0000 @@ -76,8 +76,8 @@ DLL_C_SRC = about.c \ away.c \ + blist.c \ browser.c \ - buddy.c \ buddy_chat.c \ conversation.c \ core.c \ @@ -88,6 +88,7 @@ ft.c \ gaim-disclosure.c \ gaimrc.c \ + gtkblist.c \ gtkconv.c \ gtkcellrendererprogress.c \ gtkdebug.c \ @@ -98,7 +99,6 @@ gtkutils.c \ html.c \ idle.c \ - list.c \ log.c \ main.c \ md5.c \
--- a/src/gaim.h Mon Apr 28 02:41:00 2003 +0000 +++ b/src/gaim.h Mon Apr 28 06:11:49 2003 +0000 @@ -183,9 +183,6 @@ #define OPT_POUNCE_NOTIFY 0x200 -#define CONVERSATION_TITLE "%s - Gaim" -#define LOG_CONVERSATION_TITLE "%s - Gaim (logged)" - /* These should all be runtime selectable */ #define MSG_LEN 2048 @@ -195,7 +192,7 @@ #define BUF_LEN MSG_LEN #define BUF_LONG BUF_LEN * 2 -/* Globals in aim.c */ +/* Globals in main.c */ extern int opt_away; extern char *opt_away_arg; extern char *opt_rcfile_arg; @@ -204,9 +201,9 @@ extern guint misc_options; #define OPT_MISC_DEBUG 0x00000001 #define OPT_MISC_BROWSER_POPUP 0x00000002 -#define OPT_MISC_BUDDY_TICKER 0x00000004 -#define OPT_MISC_STEALTH_TYPING 0x00000010 -#define OPT_MISC_USE_SERVER_ALIAS 0x00000020 +#define OPT_MISC_BUDDY_TICKER 0x00000004 +#define OPT_MISC_STEALTH_TYPING 0x00000010 +#define OPT_MISC_USE_SERVER_ALIAS 0x00000020 extern guint logging_options; #define OPT_LOG_CONVOS 0x00000001 @@ -313,7 +310,7 @@ extern guint away_options; #define OPT_AWAY_BACK_ON_IM 0x00000002 -/* #define OPT_AWAY_TIK_HACK 0x00000004 */ +/* #define OPT_AWAY_TOMBSTONE 0x00000004 */ #define OPT_AWAY_AUTO 0x00000008 #define OPT_AWAY_NO_AUTO_RESP 0x00000010 #define OPT_AWAY_QUEUE 0x00000020 @@ -332,10 +329,10 @@ extern struct save_pos blist_pos; extern struct window_size conv_size, buddy_chat_size; -/* Functions in aim.c */ +/* Functions in main.c */ extern void do_quit(); -/* Functions in buddy.c */ +/* Functions in gtkblist.c */ extern void signoff(struct gaim_connection *); /* Functions in buddy_chat.c */
--- a/src/gaimrc.c Mon Apr 28 02:41:00 2003 +0000 +++ b/src/gaimrc.c Mon Apr 28 06:11:49 2003 +0000 @@ -839,7 +839,7 @@ { /* OPT_GEN_BACK_ON_IM */ 0x00020000, &away_options, OPT_AWAY_BACK_ON_IM }, { /* OPT_GEN_CTL_CHARS */ 0x00080000, &convo_options, OPT_CONVO_CTL_CHARS }, #if 0 -{ /* OPT_GEN_TIK_HACK */ 0x00100000, &away_options, OPT_AWAY_TIK_HACK }, +{ /* OPT_GEN_TOMBSTONE */ 0x00100000, &away_options, OPT_AWAY_TOMBSTONE }, #endif { /* OPT_GEN_CTL_SMILEYS */ 0x00200000, &convo_options, OPT_CONVO_CTL_SMILEYS }, { /* OPT_GEN_AUTO_AWAY */ 0x00800000, &away_options, OPT_AWAY_AUTO },
--- a/src/gtkblist.h Mon Apr 28 02:41:00 2003 +0000 +++ b/src/gtkblist.h Mon Apr 28 06:11:49 2003 +0000 @@ -1,5 +1,5 @@ /** - * @file gtklist.h GTK+ Buddy List API + * @file gtkblist.h GTK+ Buddy List API * @ingroup gtkui * * gaim
--- a/src/prefs.c Mon Apr 28 02:41:00 2003 +0000 +++ b/src/prefs.c Mon Apr 28 06:11:49 2003 +0000 @@ -540,7 +540,6 @@ gaim_button(_("Ignore c_olors"), &convo_options, OPT_CONVO_IGNORE_COLOUR, vbox); gaim_button(_("Ignore font _faces"), &convo_options, OPT_CONVO_IGNORE_FONTS, vbox); gaim_button(_("Ignore font si_zes"), &convo_options, OPT_CONVO_IGNORE_SIZES, vbox); -/* gaim_button(_("Ignore Ti_K Automated Messages"), &away_options, OPT_AWAY_TIK_HACK, vbox); */ gtk_widget_show_all(ret); return ret;
--- a/src/server.c Mon Apr 28 02:41:00 2003 +0000 +++ b/src/server.c Mon Apr 28 06:11:49 2003 +0000 @@ -793,26 +793,6 @@ message = g_memdup(msg, len); } -#if 0 - /* - * TiK, using TOC, sends an automated message in order to get your - * away message. Now, this is one of the biggest hacks I think I've - * seen. But, in order to be nice to TiK, we're going to give users - * the option to ignore it. - */ - if ((away_options & OPT_AWAY_TIK_HACK) && gc->away && - strlen(gc->away) && (len < 0) && - - !strcmp(message, ">>>Automated Message: Getting Away Message<<<")) { - char *tmpmsg = stylize(awaymessage->message, MSG_LEN); - serv_send_im(gc, name, tmpmsg, -1, IM_FLAG_AWAY); - g_free(tmpmsg); - g_free(name); - g_free(message); - return; - } -#endif - /* * If you can't figure this out, stop reading right now. * "We're not worthy! We're not worthy!"