Mercurial > pidgin
changeset 1056:bde34730789c
[gaim-migrate @ 1066]
removed unnecessary dependency on libfaim's aim.h from all files except the one that really needs it, oscar.c
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 03 Nov 2000 10:31:56 +0000 |
| parents | 5a99def38a47 |
| children | d50d3abb9eb7 |
| files | plugins/irc.c plugins/yay/Makefile.am src/buddy.c src/gaim.h src/idle.c src/multi.c src/multi.h src/server.c |
| diffstat | 8 files changed, 4 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/irc.c Fri Nov 03 10:07:17 2000 +0000 +++ b/plugins/irc.c Fri Nov 03 10:31:56 2000 +0000 @@ -38,7 +38,6 @@ #include "multi.h" #include "prpl.h" #include "gaim.h" -#include "aim.h" #include "gnome_applet_mgr.h" #include "pixmaps/cancel.xpm"
--- a/plugins/yay/Makefile.am Fri Nov 03 10:07:17 2000 +0000 +++ b/plugins/yay/Makefile.am Fri Nov 03 10:31:56 2000 +0000 @@ -1,4 +1,4 @@ -CFLAGS += -I../../src -I../../libfaim/faim -I../../libfaim +CFLAGS += -I../../src LIBS = $(GTK_LIBS) pkgdir = $(libdir)/gaim
--- a/src/buddy.c Fri Nov 03 10:07:17 2000 +0000 +++ b/src/buddy.c Fri Nov 03 10:31:56 2000 +0000 @@ -40,7 +40,6 @@ #include <gdk/gdkx.h> #include "prpl.h" #include "gaim.h" -#include <aim.h> #include "pixmaps/login_icon.xpm" #include "pixmaps/logout_icon.xpm" #include "pixmaps/no_icon.xpm" @@ -1206,41 +1205,6 @@ } -static char *caps_string(u_short caps) -{ - static char buf[BUF_LEN]; - int count = 0, i = 0; - u_short bit = 1; - while (bit <= AIM_CAPS_SENDFILE) { - if (bit & caps) { - switch (bit) { - case AIM_CAPS_BUDDYICON: - i += g_snprintf(buf + i, sizeof(buf) - i, _("%sBuddy Icon"), count ? ", " : ""); - break; - case AIM_CAPS_VOICE: - i += g_snprintf(buf + i, sizeof(buf) - i, _("%sVoice"), count ? ", " : ""); - break; - case AIM_CAPS_IMIMAGE: - i += g_snprintf(buf + i, sizeof(buf) - i, _("%sIM Image"), count ? ", " : ""); - break; - case AIM_CAPS_CHAT: - i += g_snprintf(buf + i, sizeof(buf) - i, _("%sChat"), count ? ", " : ""); - break; - case AIM_CAPS_GETFILE: - i += g_snprintf(buf + i, sizeof(buf) - i, _("%sGet File"), count ? ", " : ""); - break; - case AIM_CAPS_SENDFILE: - i += g_snprintf(buf + i, sizeof(buf) - i, _("%sSend File"), count ? ", " : ""); - break; - } - count++; - } - bit <<= 1; - } - return buf; -} - - static struct group_show *find_group_show(char *group) { GSList *m = shows; struct group_show *g = NULL;
--- a/src/gaim.h Fri Nov 03 10:07:17 2000 +0000 +++ b/src/gaim.h Fri Nov 03 10:31:56 2000 +0000 @@ -35,7 +35,6 @@ #ifdef USE_GNOME #include <gnome.h> #endif -#include "aim.h" #include "multi.h" @@ -226,7 +225,7 @@ time_t signon; time_t idle; int uc; - u_short caps; /* woohoo! */ + gushort caps; /* woohoo! */ }; struct buddy_show { @@ -666,7 +665,7 @@ extern void serv_chat_send(struct gaim_connection *, int, char *); /* output from serv */ -extern void serv_got_update(struct gaim_connection *, char *, int, int, time_t, time_t, int, u_short); +extern void serv_got_update(struct gaim_connection *, char *, int, int, time_t, time_t, int, gushort); extern void serv_got_im(struct gaim_connection *, char *, char *, int); extern void serv_got_eviled(char *, int); extern void serv_got_chat_invite(struct gaim_connection *, char *, int, char *, char *);
--- a/src/idle.c Fri Nov 03 10:07:17 2000 +0000 +++ b/src/idle.c Fri Nov 03 10:31:56 2000 +0000 @@ -25,7 +25,6 @@ #include <time.h> #include <stdio.h> #include <unistd.h> -#include <aim.h> #ifdef USE_SCREENSAVER #include <X11/Xlib.h>
--- a/src/multi.c Fri Nov 03 10:07:17 2000 +0000 +++ b/src/multi.c Fri Nov 03 10:31:56 2000 +0000 @@ -24,7 +24,6 @@ #include "multi.h" #include "gaim.h" #include "gnome_applet_mgr.h" -#include "aim.h" #include "pixmaps/gnome_add.xpm" #include "pixmaps/gnome_preferences.xpm"
--- a/src/multi.h Fri Nov 03 10:07:17 2000 +0000 +++ b/src/multi.h Fri Nov 03 10:31:56 2000 +0000 @@ -24,7 +24,6 @@ #include <gtk/gtk.h> #include "gaim.h" -#include "aim.h" /* ok. now the fun begins. first we create a connection structure */ struct gaim_connection {
--- a/src/server.c Fri Nov 03 10:07:17 2000 +0000 +++ b/src/server.c Fri Nov 03 10:31:56 2000 +0000 @@ -30,7 +30,6 @@ #include <sys/time.h> #include <unistd.h> #include <gtk/gtk.h> -#include <aim.h> #ifdef USE_SCREENSAVER #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -397,7 +396,7 @@ -void serv_got_update(struct gaim_connection *gc, char *name, int loggedin, int evil, time_t signon, time_t idle, int type, u_short caps) +void serv_got_update(struct gaim_connection *gc, char *name, int loggedin, int evil, time_t signon, time_t idle, int type, gushort caps) { struct buddy *b = find_buddy(gc, name); struct gaim_connection *g = find_gaim_conn_by_name(name);