Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25531/src
Modified Files:
Makefile.am account.c buddy_chat.c connection.c connection.h
conversation.c conversation.h core.h dialogs.c gtkaccount.c
gtkblist.c gtkconv.c gtkutils.c main.c proxy.h prpl.c prpl.h
ui.h
Added Files:
gtkconn.c gtkconn.h
Log Message:
this almost kinda sorta works. It's the wonderful connecting dialog
that shows you how far along you are in connecting. This also gets rid of
the ever-present signon dialog.
Oh, and I ended up digging through header hell and changing a lot. Hopefully
I didn't break anything too badly.
--- NEW FILE: gtkconn.c ---
/*
* gaim
*
* Copyright (C) 1998-1999, Mark Spencer <markster@...>
*
* 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
*
*/
#include <string.h>
#include <gtk/gtk.h>
#include "account.h"
#include "gtkblist.h"
#include "gaim.h"
#ifdef _WIN32
#include "win32dep.h"
#endif
struct signon_meter {
GaimAccount *account;
GtkWidget *button;
GtkWidget *progress;
GtkWidget *status;
};
struct meter_window {
GtkWidget *window;
GtkWidget *table;
gint rows;
gint active_count;
GSList *meters;
} *meter_win = NULL;
static void cancel_signon(GtkWidget *button, struct signon_meter *meter)
{
meter->account->gc->wants_to_die = TRUE;
gaim_connection_destroy(meter->account->gc);
}
static void cancel_all () {
GSList *m = meter_win ? meter_win->meters : NULL;
while (m) {
cancel_signon(NULL, m->data);
m = meter_win ? meter_win->meters : NULL;
}
}
static gint meter_destroy(GtkWidget *window, GdkEvent *evt, struct signon_meter *meter)
{
return TRUE;
}
static struct signon_meter *find_signon_meter(GaimConnection *gc)
{
GSList *m = meter_win ? meter_win->meters : NULL;
while (m) {
if (((struct signon_meter *)m->data)->account == gc->account)
return m->data;
m = m->next;
}
return NULL;
}
static GtkWidget* create_meter_pixmap (GaimConnection *gc)
{
GdkPixbuf *pb = create_prpl_icon(gc->account);
GdkPixbuf *scale = gdk_pixbuf_scale_simple(pb, 30,30,GDK_INTERP_BILINEAR);
GtkWidget *image =
gtk_image_new_from_pixbuf(scale);
g_object_unref(G_OBJECT(pb));
g_object_unref(G_OBJECT(scale));
return image;
}
static struct signon_meter *
new_meter(GaimConnection *gc, GtkWidget *widget,
GtkWidget *table, gint *rows)
{
GtkWidget *graphic;
GtkWidget *label;
GtkWidget *nest_vbox;
GString *name_to_print;
struct signon_meter *meter;
meter = g_new0(struct signon_meter, 1);
meter->account = gaim_connection_get_account(gc);
name_to_print = g_string_new(gaim_account_get_username(meter->account));
(*rows)++;
gtk_table_resize (GTK_TABLE(table), *rows, 4);
graphic = create_meter_pixmap(gc);
nest_vbox = gtk_vbox_new (FALSE, 0);
g_string_prepend(name_to_print, _("Signon: "));
label = gtk_label_new (name_to_print->str);
g_string_free(name_to_print, TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
meter->status = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(meter->status), 0, 0.5);
gtk_widget_set_size_request(meter->status, 250, -1);
meter->progress = gtk_progress_bar_new ();
meter->button = gaim_pixbuf_button_from_stock (_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL);
g_signal_connect(G_OBJECT (meter->button), "clicked",
G_CALLBACK (cancel_signon), meter);
gtk_table_attach (GTK_TABLE (table), graphic, 0, 1, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
gtk_table_attach (GTK_TABLE (table), nest_vbox, 1, 2, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
gtk_box_pack_start (GTK_BOX (nest_vbox), GTK_WIDGET (label), FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (nest_vbox), GTK_WIDGET (meter->status), FALSE, FALSE, 0);
gtk_table_attach (GTK_TABLE (table), meter->progress, 2, 3, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
gtk_table_attach (GTK_TABLE (table), meter->button, 3, 4, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
gtk_widget_show_all (GTK_WIDGET (meter_win->window));
meter_win->active_count++;
return meter;
}
static void kill_meter(struct signon_meter *meter, const char *text) {
gtk_widget_set_sensitive (meter->button, FALSE);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(meter->progress), 1);
gtk_label_set_text(GTK_LABEL(meter->status), text);
meter_win->active_count--;
if (meter_win->active_count == 0) {
gtk_widget_destroy(meter_win->window);
g_free (meter_win);
meter_win = NULL;
}
}
static void gaim_gtk_connection_connect_progress(GaimConnection *gc,
const char *text, size_t step, size_t step_count)
{
struct signon_meter *meter;
if(!meter_win) {
GtkWidget *vbox;
GtkWidget *cancel_button;
if(mainwindow)
gtk_widget_hide(mainwindow);
meter_win = g_new0(struct meter_window, 1);
meter_win->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_resizable(GTK_WINDOW(meter_win->window), FALSE);
gtk_window_set_role(GTK_WINDOW(meter_win->window), "signon");
gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5);
gtk_window_set_title(GTK_WINDOW(meter_win->window), _("Signon"));
gtk_widget_realize(meter_win->window);
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add(GTK_CONTAINER(meter_win->window), vbox);
meter_win->table = gtk_table_new(1, 4, FALSE);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(meter_win->table),
FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(meter_win->table), 5);
gtk_table_set_row_spacings(GTK_TABLE(meter_win->table), 5);
gtk_table_set_col_spacings(GTK_TABLE(meter_win->table), 10);
cancel_button = gaim_pixbuf_button_from_stock(_("Cancel All"),
GTK_STOCK_QUIT, GAIM_BUTTON_HORIZONTAL);
g_signal_connect_swapped(G_OBJECT(cancel_button), "clicked",
G_CALLBACK(cancel_all), NULL);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(cancel_button),
FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(meter_win->window), "delete_event",
G_CALLBACK(meter_destroy), NULL);
}
meter = find_signon_meter(gc);
if(!meter) {
meter = new_meter(gc, meter_win->window, meter_win->table,
&meter_win->rows);
meter_win->meters = g_slist_append(meter_win->meters, meter);
}
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(meter->progress),
(float)step / (float)step_count);
gtk_label_set_text(GTK_LABEL(meter->status), text);
}
static void gaim_gtk_connection_connected(GaimConnection *gc)
{
struct signon_meter *meter = find_signon_meter(gc);
if(meter)
kill_meter(meter, _("Done."));
}
static void gaim_gtk_connection_request_pass(GaimConnection *gc)
{
}
static void gaim_gtk_connection_disconnected(GaimConnection *gc,
const char *reason)
{
struct signon_meter *meter = find_signon_meter(gc);
if(meter)
kill_meter(meter, _("Done."));
}
static void gaim_gtk_connection_notice(GaimConnection *gc,
const char *text)
{
}
static GaimConnectionUiOps conn_ui_ops =
{
gaim_gtk_connection_connect_progress,
gaim_gtk_connection_connected,
gaim_gtk_connection_request_pass,
gaim_gtk_connection_disconnected,
gaim_gtk_connection_notice
};
GaimConnectionUiOps *gaim_get_gtk_connection_ui_ops(void)
{
return &conn_ui_ops;
}
static void away_on_login(char *mesg)
{
GSList *awy = away_messages;
struct away_message *a, *message = NULL;
struct gaim_gtk_buddy_list *gtkblist;
gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
if (!gtkblist->window) {
return;
}
if (mesg == NULL) {
/* Use default message */
do_away_message(NULL, default_away);
} else {
/* Use argument */
while (awy) {
a = (struct away_message *)awy->data;
if (strcmp(a->name, mesg) == 0) {
message = a;
break;
}
awy = awy->next;
}
if (message == NULL)
message = default_away;
do_away_message(NULL, message);
}
return;
}
struct kick_dlg {
GaimAccount *account;
GtkWidget *dlg;
};
static GSList *kicks = NULL;
static struct kick_dlg *find_kick_dlg(GaimAccount *account)
{
GSList *k = kicks;
while (k) {
struct kick_dlg *d = k->data;
if (d->account == account)
return d;
k = k->next;
}
return NULL;
}
static void set_kick_null(struct kick_dlg *k)
{
kicks = g_slist_remove(kicks, k);
g_free(k);
}
/*
* Common code for hide_login_progress(), and hide_login_progress_info()
*/
static void hide_login_progress_common(GaimConnection *gc,
char *details,
char *title,
char *prologue)
{
gchar *buf;
struct kick_dlg *k = find_kick_dlg(gc->account);
struct signon_meter *meter = find_signon_meter(gc);
buf = g_strdup_printf(_("%s\n%s: %s"), full_date(), prologue, details);
if (k)
gtk_widget_destroy(k->dlg);
k = g_new0(struct kick_dlg, 1);
k->account = gc->account;
k->dlg = gaim_notify_message(NULL, GAIM_NOTIFY_MSG_ERROR, NULL,
title, buf, G_CALLBACK(set_kick_null), k);
kicks = g_slist_append(kicks, k);
if (meter) {
kill_meter(meter, _("Done."));
meter_win->meters = g_slist_remove(meter_win->meters, meter);
g_free(meter);
}
g_free(buf);
}
static void hide_login_progress(GaimConnection *gc, char *why)
{
GaimAccount *account = gaim_connection_get_account(gc);
gchar *buf;
gaim_event_broadcast(event_error, gc, why);
buf = g_strdup_printf(_("%s was unable to sign on"),
gaim_account_get_username(account));
hide_login_progress_common(gc, why, _("Signon Error"), buf);
g_free(buf);
}
/*
* Like hide_login_progress(), but for informational, not error/warning,
* messages.
*
*/
static void hide_login_progress_notice(GaimConnection *gc, char *why)
{
GaimAccount *account = gaim_connection_get_account(gc);
hide_login_progress_common(gc, why, _("Notice"),
(char *)gaim_account_get_username(account));
}
/*
* Like hide_login_progress(), but for non-signon error messages.
*
*/
static void hide_login_progress_error(GaimConnection *gc, char *why)
{
char buf[2048];
GaimAccount *account = gaim_connection_get_account(gc);
gaim_event_broadcast(event_error, gc, why);
g_snprintf(buf, sizeof(buf), _("%s has been signed off"),
gaim_account_get_username(account));
hide_login_progress_common(gc, why, _("Connection Error"), buf);
}
--- NEW FILE: gtkconn.h ---
/**
* @file gtkconn.h GTK+ Connection API
*
* gaim
*
* Copyright (C) 2003, Nathan Walp <faceprint@...>
*
* 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
*/
#ifndef _GAIM_GTKCONN_H_
#define _GAIM_GTKCONN_H_
/**************************************************************************/
/** @name GTK+ Connection API */
/**************************************************************************/
/*@{*/
/**
* Gets GTK Connection UI ops
*
* @return UI operations struct
*/
GaimConnectionUiOps *gaim_get_gtk_connection_ui_ops(void);
/*@}*/
#endif /* _GAIM_GTKCONN_H_ */
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- Makefile.am 3 Jun 2003 03:33:20 -0000 1.90
+++ Makefile.am 3 Jun 2003 19:55:42 -0000 1.91
@@ -65,6 +65,8 @@
gtkcellrendererprogress.h \
gtkblist.c \
gtkblist.h \
+ gtkconn.c \
+ gtkconn.h \
gtkconv.c \
gtkconv.h \
gtkdebug.c \
@@ -93,8 +95,6 @@
main.c \
md5.c \
md5.h \
- multi.c \
- multi.h \
privacy.h \
session.c \
socket.c \
Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- account.c 3 Jun 2003 11:45:48 -0000 1.20
+++ account.c 3 Jun 2003 19:55:42 -0000 1.21
@@ -32,8 +32,10 @@
#include <glib.h>
#include "account.h"
+#include "debug.h"
#include "prefs.h"
#include "prpl.h"
+#include "util.h"
typedef enum
{
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- buddy_chat.c 30 May 2003 09:38:19 -0000 1.200
+++ buddy_chat.c 3 Jun 2003 19:55:42 -0000 1.201
@@ -33,6 +33,8 @@
#include "prpl.h"
#include "notify.h"
+#include "gaim.h"
+#include "multi.h"
#ifdef _WIN32
#include "wspell.h"
Index: connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- connection.c 2 Jun 2003 21:51:00 -0000 1.10
+++ connection.c 3 Jun 2003 19:55:42 -0000 1.11
@@ -20,7 +20,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#include "connection.h"
+#include "debug.h"
+#include "gaim.h"
static GList *connections = NULL;
static GList *connections_connecting = NULL;
Index: connection.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- connection.h 30 May 2003 23:03:02 -0000 1.3
+++ connection.h 3 Jun 2003 19:55:42 -0000 1.4
@@ -29,7 +29,6 @@
#include "account.h"
#include "plugin.h"
-#include "multi.h"
typedef enum
{
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -d -r1.521 -r1.522
--- conversation.c 2 Jun 2003 22:30:25 -0000 1.521
+++ conversation.c 3 Jun 2003 19:55:42 -0000 1.522
@@ -30,6 +30,7 @@
#include <ctype.h>
#include "conversation.h"
#include "gaim.h"
+#include "multi.h"
#include "prpl.h"
#include "notify.h"
#include "prefs.h"
Index: conversation.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- conversation.h 2 Jun 2003 21:51:01 -0000 1.14
+++ conversation.h 3 Jun 2003 19:55:43 -0000 1.15
@@ -24,6 +24,8 @@
#ifndef _GAIM_CONVERSATION_H_
#define _GAIM_CONVERSATION_H_
+#include "account.h"
+
/**************************************************************************/
/** Data Structures */
/**************************************************************************/
@@ -83,9 +85,6 @@
GAIM_CONV_ACCOUNT_OFFLINE, /**< One of the user's accounts went offline. */
GAIM_CONV_UPDATE_AWAY /**< The other user went away. */
};
-
-/* Yeah, this has to be included here. Ugh. */
-#include "gaim.h"
/**
* Conversation window operations.
Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- core.h 2 Jun 2003 21:51:01 -0000 1.54
+++ core.h 3 Jun 2003 19:55:43 -0000 1.55
@@ -47,7 +47,6 @@
#include "debug.h"
-#include "multi.h"
#include "conversation.h"
#include "ft.h"
#include "privacy.h"
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -d -r1.480 -r1.481
--- dialogs.c 2 Jun 2003 21:51:02 -0000 1.480
+++ dialogs.c 3 Jun 2003 19:55:43 -0000 1.481
@@ -51,6 +51,7 @@
#include "gtkblist.h"
#include "notify.h"
#include "prefs.h"
+#include "multi.h"
#ifdef _WIN32
#include "win32dep.h"
Index: gtkaccount.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- gtkaccount.c 3 Jun 2003 17:30:35 -0000 1.46
+++ gtkaccount.c 3 Jun 2003 19:55:44 -0000 1.47
@@ -20,6 +20,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
+#include <gtk/gtk.h>
+
#include "gtkaccount.h"
#include "account.h"
#include "accountopt.h"
@@ -28,8 +31,9 @@
#include "stock.h"
#include "gtkblist.h"
#include "gaim-disclosure.h"
+#include "gaim.h"
-#ifdef _WIN32
+#ifdef _WIN32
# include <gdk/gdkwin32.h>
#else
# include <unistd.h>
Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- gtkblist.c 2 Jun 2003 21:51:03 -0000 1.48
+++ gtkblist.c 3 Jun 2003 19:55:44 -0000 1.49
@@ -55,6 +55,7 @@
#include "gtkft.h"
#include "gtkpounce.h"
#include "prefs.h"
+#include "multi.h"
#ifdef _WIN32
#include "win32dep.h"
Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- gtkconv.c 3 Jun 2003 02:00:24 -0000 1.133
+++ gtkconv.c 3 Jun 2003 19:55:44 -0000 1.134
@@ -46,6 +46,11 @@
#include "gtkblist.h"
#include "notify.h"
#include "prefs.h"
+#include "gtkconv.h"
+#include "gaim.h"
+#include "ui.h"
+#include "debug.h"
+#include "multi.h"
#ifdef _WIN32
#include "win32dep.h"
Index: gtkutils.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkutils.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gtkutils.c 3 Jun 2003 05:33:46 -0000 1.19
+++ gtkutils.c 3 Jun 2003 19:55:44 -0000 1.20
@@ -46,6 +46,7 @@
#include <gdk/gdkkeysyms.h>
#include "prefs.h"
#include "prpl.h"
+#include "gaim.h"
#include "ui.h"
#include "notify.h"
Index: main.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/main.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- main.c 3 Jun 2003 03:33:20 -0000 1.43
+++ main.c 3 Jun 2003 19:55:44 -0000 1.44
@@ -56,6 +56,7 @@
#include "notify.h"
#include "gtkaccount.h"
#include "gtkblist.h"
+#include "gtkconn.h"
#include "gtkdebug.h"
#include "gtknotify.h"
#include "gtkrequest.h"
@@ -892,6 +893,7 @@
gaim_set_notify_ui_ops(gaim_get_gtk_notify_ui_ops());
gaim_set_request_ui_ops(gaim_get_gtk_request_ui_ops());
gaim_set_sound_ui_ops(gaim_get_gtk_sound_ui_ops());
+ gaim_set_connection_ui_ops(gaim_get_gtk_connection_ui_ops());
gaim_proxy_init();
gaim_sound_init();
Index: proxy.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- proxy.h 3 Jun 2003 02:04:29 -0000 1.18
+++ proxy.h 3 Jun 2003 19:55:44 -0000 1.19
@@ -37,7 +37,6 @@
#include <glib.h>
-#include "core.h"
#include "account.h"
/**
Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- prpl.c 2 Jun 2003 21:51:04 -0000 1.115
+++ prpl.c 3 Jun 2003 19:55:44 -0000 1.116
@@ -22,6 +22,7 @@
#include "gaim.h"
#include "gtkutils.h"
#include "gtkblist.h"
+#include "multi.h"
#include "prpl.h"
#include "notify.h"
#include <sys/types.h>
Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- prpl.h 2 Jun 2003 14:41:22 -0000 1.111
+++ prpl.h 3 Jun 2003 19:55:45 -0000 1.112
@@ -64,9 +64,9 @@
} GaimProtocol;
-#include "core.h"
+#include "blist.h"
#include "proxy.h"
-#include "multi.h"
+#include "plugin.h"
/** Default protocol plugin description */
#define GAIM_PRPL_DESC(x) \
Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- ui.h 2 Jun 2003 21:51:05 -0000 1.115
+++ ui.h 3 Jun 2003 19:55:45 -0000 1.116
@@ -32,7 +32,6 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "core.h"
-#include "multi.h"
#include "gtkconv.h"
#include "pounce.h"
#include "gtkft.h"
|
