Menu
▾
▴
[Gaim-commits] CVS: gaim/src Makefile.mingw,1.28,1.29 gaim.h,1.391,1.392 gaimrc.c,1.159,1.160 gtkblist.h,1.2,1.3 prefs.c,1.368,1.369 server.c,1.302,1.303
|
From: Mark D. <the...@us...> - 2003-04-28 06:11:53
|
Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28297/src
Modified Files:
Makefile.mingw gaim.h gaimrc.c gtkblist.h prefs.c server.c
Log Message:
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."
Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.mingw,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.mingw 26 Apr 2003 14:55:40 -0000 1.28
+++ Makefile.mingw 28 Apr 2003 06:11:47 -0000 1.29
@@ -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 \
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -d -r1.391 -r1.392
--- gaim.h 26 Apr 2003 20:30:31 -0000 1.391
+++ gaim.h 28 Apr 2003 06:11:48 -0000 1.392
@@ -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 */
Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- gaimrc.c 26 Apr 2003 06:46:07 -0000 1.159
+++ gaimrc.c 28 Apr 2003 06:11:48 -0000 1.160
@@ -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 },
Index: gtkblist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtkblist.h 26 Apr 2003 20:30:31 -0000 1.2
+++ gtkblist.h 28 Apr 2003 06:11:48 -0000 1.3
@@ -1,5 +1,5 @@
/**
- * @file gtklist.h GTK+ Buddy List API
+ * @file gtkblist.h GTK+ Buddy List API
* @ingroup gtkui
*
* gaim
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -d -r1.368 -r1.369
--- prefs.c 26 Apr 2003 17:56:22 -0000 1.368
+++ prefs.c 28 Apr 2003 06:11:48 -0000 1.369
@@ -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;
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- server.c 27 Apr 2003 17:10:02 -0000 1.302
+++ server.c 28 Apr 2003 06:11:49 -0000 1.303
@@ -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!"
|