HGKeeper

Index: configure.ac

===================================================================

RCS file: /cvsroot/gaim/gaim/configure.ac,v

retrieving revision 1.9

diff -u -r1.9 configure.ac

--- configure.ac 2001/08/28 18:57:09 1.9

+++ configure.ac 2001/08/29 08:48:26

@@ -74,8 +74,9 @@

AC_SUBST(STATIC_LINK_LIBS)

AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto })

+AC_ARG_ENABLE(gtk2, [ --enable-gtk2 compile using GTK 2],,enable_gtk2=no)

AC_ARG_ENABLE(gnome, [ --disable-gnome compile without Gnome bits],,enable_gnome=yes)

-AC_ARG_ENABLE(pixbuf, [ --disable-pixbuf compile without GdkPixbuf (needed for Buddy Icons)],,enable_pixbuf=yes)

+AC_ARG_ENABLE(pixbuf, [ --disable-pixbuf compile without GdkPixbuf (needed for Buddy Icons)],,enable_pixbuf=yes)

AC_ARG_ENABLE(panel, [ --enable-panel compile as a GNOME applet],,enable_panel=$enable_distrib)

AM_CONDITIONAL(GNOMEAPPLET, test "x$enable_panel" = "xyes")

@@ -95,6 +96,15 @@

AC_DEFINE(DEBUG)

+if test "x$enable_gtk2" = "xyes" ; then

+ AM_PATH_GTK_2_0(1.2.3,[

+ enable_gnome=no

+ enable_pixbuf=no

+ CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN"

+ UI_LIBS="$UI_LIBS $GTK_LIBS"

+ ],enable_gtk2=no,gthread)

+fi

if test "x$enable_gnome" = "xyes" ; then

if test "x$enable_panel" = "xyes" ; then

GNOME_INIT(applets)

@@ -130,7 +140,7 @@

-if test "x$enable_gnome" != "xyes" ; then

+if test "x$enable_gnome" != "xyes" -a "x$enable_gtk2" != "xyes" ; then

AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR([

*** GLib is required to build Gaim; please make sure you have the GLib

*** development headers installed. The latest version of GLib is

Index: plugins/lagmeter.c

===================================================================

RCS file: /cvsroot/gaim/gaim/plugins/lagmeter.c,v

retrieving revision 1.13

diff -u -r1.13 lagmeter.c

--- plugins/lagmeter.c 2001/06/02 02:58:03 1.13

+++ plugins/lagmeter.c 2001/08/29 08:48:27

@@ -187,7 +187,7 @@

return;

}

- confdlg = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(confdlg)

gtk_window_set_title(GTK_WINDOW(confdlg), "Gaim Lag Delay");

box = gtk_hbox_new(FALSE, 0);

Index: plugins/spellchk.c

===================================================================

RCS file: /cvsroot/gaim/gaim/plugins/spellchk.c,v

retrieving revision 1.20

diff -u -r1.20 spellchk.c

--- plugins/spellchk.c 2001/06/02 02:58:03 1.20

+++ plugins/spellchk.c 2001/08/29 08:48:27

@@ -357,7 +357,7 @@

char *pair[2] = {"Replace", "With"};

if (configwin) return;

- configwin = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(configwin)

gtk_widget_set_usize(configwin, 450, 250);

gtk_window_set_title(GTK_WINDOW(configwin), "Spell Check Config");

Index: plugins/toc_commands.c

===================================================================

RCS file: /cvsroot/gaim/gaim/plugins/toc_commands.c,v

retrieving revision 1.6

diff -u -r1.6 toc_commands.c

--- plugins/toc_commands.c 2001/06/02 02:58:03 1.6

+++ plugins/toc_commands.c 2001/08/29 08:48:27

@@ -19,7 +19,7 @@

char *gaim_plugin_init(GModule *h) {

GtkWidget *entry;

- window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(window)

gtk_window_set_title(GTK_WINDOW(window), "Gaim - SFLAP interface");

entry = gtk_entry_new();

Index: src/about.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/about.c,v

retrieving revision 1.41

diff -u -r1.41 about.c

--- src/about.c 2001/07/31 23:23:40 1.41

+++ src/about.c 2001/08/29 08:48:27

@@ -82,7 +82,7 @@

if (!about) {

- about = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(about)

gtk_widget_set_usize(GTK_WIDGET(about), 450, 450);

Index: src/away.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/away.c,v

retrieving revision 1.59

diff -u -r1.59 away.c

--- src/away.c 2001/07/31 23:23:40 1.59

+++ src/away.c 2001/08/29 08:48:28

@@ -145,7 +145,7 @@

return;

if (!imaway) {

- imaway = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(imaway)

gtk_window_set_wmclass(GTK_WINDOW(imaway), "imaway", "Gaim");

if (strlen(a->name))

gtk_window_set_title(GTK_WINDOW(imaway), a->name);

Index: src/buddy.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/buddy.c,v

retrieving revision 1.238

diff -u -r1.238 buddy.c

--- src/buddy.c 2001/08/27 07:11:49 1.238

+++ src/buddy.c 2001/08/29 08:48:30

@@ -2583,7 +2583,7 @@

#ifdef USE_APPLET

- blist = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(blist)

#else

blist = gtk_window_new(GTK_WINDOW_TOPLEVEL);

#endif

Index: src/buddy_chat.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v

retrieving revision 1.100

diff -u -r1.100 buddy_chat.c

--- src/buddy_chat.c 2001/07/31 23:23:40 1.100

+++ src/buddy_chat.c 2001/08/29 08:48:30

@@ -193,7 +193,7 @@

}

if (!joinchat) {

- joinchat = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(joinchat)

gtk_window_set_wmclass(GTK_WINDOW(joinchat), "joinchat", "Gaim");

gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE);

gtk_widget_realize(joinchat);

@@ -282,7 +282,7 @@

GtkWidget *vbox;

GtkWidget *topbox;

if (!invite) {

- invite = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(invite)

cancel = gtk_button_new_with_label(_("Cancel"));

invite_btn = gtk_button_new_with_label(_("Invite"));

bbox = gtk_hbox_new(TRUE, 10);

Index: src/conversation.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/conversation.c,v

retrieving revision 1.243

diff -u -r1.243 conversation.c

--- src/conversation.c 2001/08/26 20:21:45 1.243

+++ src/conversation.c 2001/08/29 08:48:31

@@ -673,12 +673,12 @@

break;

}

if (buf[0]) {

- if (GTK_EDITABLE(c->entry)->has_selection) {

- int finish = GTK_EDITABLE(c->entry)->selection_end_pos;

+ if (GTK_OLD_EDITABLE(c->entry)->has_selection) {

+ int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos;

gtk_editable_insert_text(GTK_EDITABLE(c->entry),

buf, strlen(buf), &finish);

} else {

- pos = GTK_EDITABLE(c->entry)->current_pos;

+ pos = GTK_OLD_EDITABLE(c->entry)->current_pos;

gtk_editable_insert_text(GTK_EDITABLE(c->entry),

buf, strlen(buf), &pos);

}

@@ -745,7 +745,7 @@

gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");

}

- return TRUE;

+ return FALSE;

}

@@ -894,7 +894,7 @@

int entry_key_pressed(GtkWidget *w, GtkWidget *entry)

{

check_everything(w);

- return TRUE;

+ return FALSE;

}

/*------------------------------------------------------------------------*/

@@ -907,8 +907,8 @@

int res = 0;

char *tmp, *tmpo, h;

tmpo = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);

- h = tmpo[GTK_EDITABLE(entry)->current_pos];

- tmpo[GTK_EDITABLE(entry)->current_pos] = '\0';

+ h = tmpo[GTK_OLD_EDITABLE(entry)->current_pos];

+ tmpo[GTK_OLD_EDITABLE(entry)->current_pos] = '\0';

tmp = tmpo;

do {

p1 = strstr(tmp, s1);

@@ -931,7 +931,7 @@

}

} while (p1 || p2);

- tmpo[GTK_EDITABLE(entry)->current_pos] = h;

+ tmpo[GTK_OLD_EDITABLE(entry)->current_pos] = h;

g_free(tmpo);

return res;

}

@@ -939,8 +939,8 @@

int invert_tags(GtkWidget *entry, char *s1, char *s2, int really)

{

- int start = GTK_EDITABLE(entry)->selection_start_pos;

- int finish = GTK_EDITABLE(entry)->selection_end_pos;

+ int start = GTK_OLD_EDITABLE(entry)->selection_start_pos;

+ int finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;

char *s;

s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);

@@ -962,8 +962,8 @@

void remove_tags(GtkWidget *entry, char *tag)

{

char *s, *t;

- int start = GTK_EDITABLE(entry)->selection_start_pos;

- int finish = GTK_EDITABLE(entry)->selection_end_pos;

+ int start = GTK_OLD_EDITABLE(entry)->selection_start_pos;

+ int finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;

int temp;

s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);

t = s;

@@ -1043,7 +1043,7 @@

void surround(GtkWidget *entry, char *pre, char *post)

{

- int temp, pos = GTK_EDITABLE(entry)->current_pos;

+ int temp, pos = GTK_OLD_EDITABLE(entry)->current_pos;

int dummy;

int start, finish;

@@ -1051,11 +1051,11 @@

gtkspell_detach(GTK_TEXT(entry));

}

- if (GTK_EDITABLE(entry)->has_selection) {

+ if (GTK_OLD_EDITABLE(entry)->has_selection) {

remove_tags(entry, pre);

remove_tags(entry, post);

- start = GTK_EDITABLE(entry)->selection_start_pos;

- finish = GTK_EDITABLE(entry)->selection_end_pos;

+ start = GTK_OLD_EDITABLE(entry)->selection_start_pos;

+ finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;

if (start > finish) {

dummy = finish;

finish = start;

@@ -1095,7 +1095,7 @@

if (invert_tags(entry, pre, post, 1))

return;

s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);

- pos = GTK_EDITABLE(entry)->current_pos;

+ pos = GTK_OLD_EDITABLE(entry)->current_pos;

debug_printf(_("Currently at %d, "), pos);

s2 = strstr(&s[pos], post);

if (s2) {

Index: src/dialogs.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v

retrieving revision 1.241

diff -u -r1.241 dialogs.c

--- src/dialogs.c 2001/08/15 17:26:14 1.241

+++ src/dialogs.c 2001/08/29 08:48:33

@@ -360,7 +360,7 @@

w->who = who;

w->gc = gc;

- w->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(w->window);

dialogwindows = g_list_prepend(dialogwindows, w->window);

gtk_window_set_wmclass(GTK_WINDOW(w->window), "warning", "Gaim");

gtk_window_set_policy(GTK_WINDOW(w->window), FALSE, FALSE, TRUE);

@@ -609,7 +609,7 @@

GtkWidget *box;

GtkWidget *eedialog;

- eedialog = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(eedialog)

ok = gtk_button_new_with_label(_("OK"));

box = gtk_vbox_new(FALSE, 10);

@@ -656,7 +656,7 @@

GtkWidget *label;

if (!imdialog) {

- imdialog = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(imdialog)

gtk_window_set_wmclass(GTK_WINDOW(imdialog), "imdialog",

"Gaim");

gtk_window_set_policy(GTK_WINDOW(imdialog), FALSE, TRUE, TRUE);

@@ -715,7 +715,7 @@

if (!infodialog) {

- infodialog = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(infodialog)

gtk_window_set_wmclass(GTK_WINDOW(infodialog), "infodialog",

"Gaim");

gtk_window_set_policy(GTK_WINDOW(infodialog), FALSE, TRUE, TRUE);

@@ -862,7 +862,7 @@

struct addbuddy *a = g_new0(struct addbuddy, 1);

a->gc = gc;

- a->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(a->window);

gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_group", "Gaim");

gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);

gtk_widget_realize(a->window);

@@ -937,7 +937,7 @@

struct addbuddy *a = g_new0(struct addbuddy, 1);

a->gc = gc;

- a->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(a->window);

gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_buddy", "Gaim");

gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);

gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy"));

@@ -1133,7 +1133,7 @@

struct addbp *b = g_new0(struct addbp, 1);

- b->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(b->window);

dialogwindows = g_list_prepend(dialogwindows, b->window);

gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);

gtk_window_set_wmclass(GTK_WINDOW(b->window), "new_bp", "Gaim");

@@ -1345,7 +1345,7 @@

gc = connections->data;

b->gc = gc;

- b->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(b->window);

dialogwindows = g_list_prepend(dialogwindows, b->window);

gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_dir", "Gaim");

gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);

@@ -1535,7 +1535,7 @@

gc = connections->data;

b->gc = gc;

- b->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(b->window);

gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);

gtk_window_set_wmclass(GTK_WINDOW(b->window), "change_passwd", "Gaim");

gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change"));

@@ -1639,7 +1639,7 @@

tmp = gc->user;

b->user = tmp;

- b->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(b->window);

gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_info", "Gaim");

dialogwindows = g_list_prepend(dialogwindows, b->window);

gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info"));

@@ -1726,7 +1726,7 @@

va_start(ap, info);

- b->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(b->window);

dialogwindows = g_list_prepend(dialogwindows, b->window);

gtk_window_set_title(GTK_WINDOW(b->window), "Gaim");

gtk_container_border_width(GTK_CONTAINER(b->window), 5);

@@ -1858,7 +1858,7 @@

p->gc = gc;

p->permit = permit;

- p->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(p->window);

gtk_container_set_border_width(GTK_CONTAINER(p->window), 5);

gtk_window_set_policy(GTK_WINDOW(p->window), FALSE, FALSE, TRUE);

gtk_widget_realize(p->window);

@@ -2057,7 +2057,7 @@

GtkWidget *frame;

struct findbyinfo *b = g_new0(struct findbyinfo, 1);

- b->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(b->window);

gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);

gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_info", "Gaim");

gtk_widget_show(b->window);

@@ -2217,7 +2217,7 @@

struct findbyemail *b = g_new0(struct findbyemail, 1);

if (g_slist_find(connections, gc))

b->gc = gc;

- b->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(b->window);

gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);

gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_email", "Gaim");

gtk_widget_realize(b->window);

@@ -2307,7 +2307,7 @@

if (!c->link_dialog) {

struct linkdlg *b = g_new0(struct linkdlg, 1);

- c->link_dialog = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(c->link_dialog);

gtk_window_set_wmclass(GTK_WINDOW(c->link_dialog),

"add_link", "Gaim");

dialogwindows = g_list_prepend(dialogwindows, c->link_dialog);

@@ -3126,7 +3126,7 @@

struct create_away *ca = g_new0(struct create_away, 1);

/* Set up window */

- ca->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(ca->window);

gtk_widget_set_usize(ca->window, -1, 250);

gtk_container_border_width(GTK_CONTAINER(ca->window), 5);

gtk_window_set_wmclass(GTK_WINDOW(ca->window), "away_mess", "Gaim");

@@ -3267,12 +3267,12 @@

/* surround(c->entry, smiley_text, ""); */

- if (GTK_EDITABLE(c->entry)->has_selection) {

- int finish = GTK_EDITABLE(c->entry)->selection_end_pos;

+ if (GTK_OLD_EDITABLE(c->entry)->has_selection) {

+ int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos;

gtk_editable_insert_text(GTK_EDITABLE(c->entry),

smiley_text, strlen(smiley_text), &finish);

} else {

- int pos = GTK_EDITABLE(c->entry)->current_pos;

+ int pos = GTK_OLD_EDITABLE(c->entry)->current_pos;

gtk_editable_insert_text(GTK_EDITABLE(c->entry),

smiley_text, strlen(smiley_text), &pos);

}

@@ -3315,7 +3315,7 @@

win = c->window;

- dialog = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(dialog)

gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE);

gtk_window_set_wmclass(GTK_WINDOW(dialog), "smiley_dialog", "Gaim");

gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);

@@ -3397,7 +3397,7 @@

if (aliasdlg)

gtk_widget_destroy(aliasdlg);

- aliasdlg = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(aliasdlg)

gtk_window_set_policy(GTK_WINDOW(aliasdlg), FALSE, FALSE, TRUE);

gtk_window_set_wmclass(GTK_WINDOW(aliasdlg), "alias_dialog", "Gaim");

gtk_widget_realize(aliasdlg);

@@ -3586,7 +3586,7 @@

GtkWidget *label;

GtkWidget *hsep;

- window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(window)

dialogwindows = g_list_prepend(dialogwindows, window);

gtk_window_set_wmclass(GTK_WINDOW(window), "dialog", "Gaim");

gtk_container_set_border_width(GTK_CONTAINER(window), 10);

@@ -3806,7 +3806,7 @@

GtkWidget *label;

if (!rename_dialog) {

- rename_dialog = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(rename_dialog)

gtk_window_set_wmclass(GTK_WINDOW(rename_dialog), "rename_dialog",

"Gaim");

gtk_window_set_policy(GTK_WINDOW(rename_dialog), FALSE, TRUE, TRUE);

@@ -3894,7 +3894,7 @@

GtkWidget *label;

if (!rename_bud_dialog) {

- rename_bud_dialog = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(rename_bud_dialog)

gtk_window_set_wmclass(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog",

"Gaim");

gtk_window_set_policy(GTK_WINDOW(rename_bud_dialog), FALSE, TRUE, TRUE);

Index: src/gaim.h

===================================================================

RCS file: /cvsroot/gaim/gaim/src/gaim.h,v

retrieving revision 1.246

diff -u -r1.246 gaim.h

--- src/gaim.h 2001/08/26 20:21:45 1.246

+++ src/gaim.h 2001/08/29 08:48:33

@@ -37,6 +37,17 @@

#endif

#include "multi.h"

+#if GTK_CHECK_VERSION(1,3,0)

+#define GAIM_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \

+ gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG);

+#define gtk_notebook_set_page(x,y) gtk_notebook_set_current_page(x,y)

+#define GdkWindowPrivate GdkWindowObject

+#define gtk_toolbar_new(x,y) gtk_toolbar_new()

+#else

+#define GAIM_DIALOG(x) x = gtk_window_new(GTK_WINDOW_DIALOG);

+#define GTK_OLD_EDITABLE(x) GTK_EDITABLE(x)

+#endif

1. gethostbyname();

Index: src/gtkimhtml.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v

retrieving revision 1.48

diff -u -r1.48 gtkimhtml.c

--- src/gtkimhtml.c 2001/08/29 00:04:59 1.48

+++ src/gtkimhtml.c 2001/08/29 08:48:36

@@ -237,8 +237,13 @@

&attributes, attributes_mask);

gdk_window_set_user_data (widget->window, widget);

+#if GTK_CHECK_VERSION(1,3,0)

+ attributes.x = widget->style->xthickness + BORDER_SIZE;

+ attributes.y = widget->style->xthickness + BORDER_SIZE;

+#else

attributes.x = widget->style->klass->xthickness + BORDER_SIZE;

attributes.y = widget->style->klass->xthickness + BORDER_SIZE;

+#endif

attributes.width = MAX (1, (gint) widget->allocation.width - (gint) attributes.x * 2);

attributes.height = MAX (1, (gint) widget->allocation.height - (gint) attributes.y * 2);

attributes.event_mask = gtk_widget_get_events (widget)

@@ -563,6 +568,7 @@

gtk_imhtml_draw_focus (GTK_WIDGET (imhtml));

}

+#if ! GTK_CHECK_VERSION(1,3,0)

static void

gtk_imhtml_draw (GtkWidget *widget,

GdkRectangle *area)

@@ -572,6 +578,7 @@

imhtml = GTK_IMHTML (widget);

gtk_imhtml_draw_exposed (imhtml);

}

+#endif

static void

gtk_imhtml_style_set (GtkWidget *widget,

@@ -699,7 +706,23 @@

widget->allocation = *allocation;

+#if GTK_CHECK_VERSION(1,3,0)

new_xsize = MAX (1, (gint) allocation->width -

+ (gint) (widget->style->xthickness + BORDER_SIZE) * 2);

+ new_ysize = MAX (1, (gint) allocation->height -

+ (gint) (widget->style->ythickness + BORDER_SIZE) * 2);

+ if (GTK_WIDGET_REALIZED (widget)) {

+ gint x = widget->style->xthickness + BORDER_SIZE;

+ gint y = widget->style->ythickness + BORDER_SIZE;

+ gdk_window_move_resize (widget->window,

+ allocation->x, allocation->y,

+ allocation->width, allocation->height);

+ gdk_window_move_resize (layout->bin_window,

+ x, y, new_xsize, new_ysize);

+ }

+#else

+ new_xsize = MAX (1, (gint) allocation->width -

(gint) (widget->style->klass->xthickness + BORDER_SIZE) * 2);

new_ysize = MAX (1, (gint) allocation->height -

(gint) (widget->style->klass->ythickness + BORDER_SIZE) * 2);

@@ -713,6 +736,7 @@

gdk_window_move_resize (layout->bin_window,

x, y, new_xsize, new_ysize);

}

+#endif

layout->hadjustment->page_size = new_xsize;

layout->hadjustment->page_increment = new_xsize / 2;

@@ -1511,19 +1535,26 @@

signals [URL_CLICKED] =

gtk_signal_new ("url_clicked",

GTK_RUN_FIRST,

+#if GTK_CHECK_VERSION(1,3,0)

+ GTK_CLASS_TYPE (object_class),

+#else

object_class->type,

+#endif

GTK_SIGNAL_OFFSET (GtkIMHtmlClass, url_clicked),

gtk_marshal_NONE__POINTER,

GTK_TYPE_NONE, 1,

GTK_TYPE_POINTER);

+#if ! GTK_CHECK_VERSION(1,3,0)

gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);

+ widget_class->draw = gtk_imhtml_draw;

+ widget_class->draw_focus = gtk_imhtml_draw_focus;

+#endif

object_class->destroy = gtk_imhtml_destroy;

widget_class->realize = gtk_imhtml_realize;

- widget_class->draw = gtk_imhtml_draw;

- widget_class->draw_focus = gtk_imhtml_draw_focus;

widget_class->style_set = gtk_imhtml_style_set;

widget_class->expose_event = gtk_imhtml_expose_event;

widget_class->size_allocate = gtk_imhtml_size_allocate;

@@ -3227,6 +3258,17 @@

gtk_widget_set_usize (GTK_WIDGET (imhtml), -1, imhtml->y);

+#if GTK_CHECK_VERSION(1,3,0)

+ if (!(options & GTK_IMHTML_NO_SCROLL) &&

+ scrolldown &&

+ (imhtml->y >= MAX (1,

+ (GTK_WIDGET (imhtml)->allocation.height -

+ (GTK_WIDGET (imhtml)->style->ythickness + BORDER_SIZE) * 2))))

+ gtk_adjustment_set_value (vadj, imhtml->y -

+ MAX (1, (GTK_WIDGET (imhtml)->allocation.height -

+ (GTK_WIDGET (imhtml)->style->ythickness +

+ BORDER_SIZE) * 2)));

+#else

if (!(options & GTK_IMHTML_NO_SCROLL) &&

scrolldown &&

(imhtml->y >= MAX (1,

@@ -3236,6 +3278,7 @@

MAX (1, (GTK_WIDGET (imhtml)->allocation.height -

(GTK_WIDGET (imhtml)->style->klass->ythickness +

BORDER_SIZE) * 2)));

+#endif

if (url) {

g_free (url);

Index: src/gtkticker.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/gtkticker.c,v

retrieving revision 1.2

diff -u -r1.2 gtkticker.c

--- src/gtkticker.c 2000/11/21 01:00:45 1.2

+++ src/gtkticker.c 2001/08/29 08:48:36

@@ -22,6 +22,7 @@

#include "gtkticker.h"

+#include <gtk/gtk.h>

static void gtk_ticker_compute_offsets (GtkTicker *ticker);

static void gtk_ticker_class_init (GtkTickerClass *klass);

@@ -94,7 +95,9 @@

widget_class->realize = gtk_ticker_realize;

widget_class->size_request = gtk_ticker_size_request;

widget_class->size_allocate = gtk_ticker_size_allocate;

+#if ! GTK_CHECK_VERSION(1,3,0)

widget_class->draw = gtk_ticker_draw;

+#endif

widget_class->expose_event = gtk_ticker_expose;

container_class->add = gtk_ticker_add_real;

Index: src/multi.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/multi.c,v

retrieving revision 1.68

diff -u -r1.68 multi.c

--- src/multi.c 2001/08/24 17:26:21 1.68

+++ src/multi.c 2001/08/29 08:48:37

@@ -690,7 +690,7 @@

gtk_widget_show(u->passprmt);

return;

}

- u->passprmt = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(u->passprmt);

gtk_window_set_wmclass(GTK_WINDOW(u->passprmt), "password", "Gaim");

gtk_container_border_width(GTK_CONTAINER(u->passprmt), 5);

gtk_signal_connect(GTK_OBJECT(u->passprmt), "destroy", GTK_SIGNAL_FUNC(pass_des), u);

@@ -1000,7 +1000,7 @@

GtkWidget *box, *label, *button;

char buf[256];

- gc->meter = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(gc->meter);

gtk_window_set_policy(GTK_WINDOW(gc->meter), 0, 0, 1);

gtk_window_set_wmclass(GTK_WINDOW(gc->meter), "signon", "Gaim");

gtk_container_set_border_width(GTK_CONTAINER(gc->meter), 5);

Index: src/plugins.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/plugins.c,v

retrieving revision 1.74

diff -u -r1.74 plugins.c

--- src/plugins.c 2001/08/20 20:39:29 1.74

+++ src/plugins.c 2001/08/29 08:48:38

@@ -258,7 +258,7 @@

if (plugwindow)

return;

- plugwindow = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(plugwindow)

gtk_window_set_wmclass(GTK_WINDOW(plugwindow), "plugins", "Gaim");

gtk_widget_realize(plugwindow);

aol_icon(plugwindow->window);

Index: src/prefs.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/prefs.c,v

retrieving revision 1.172

diff -u -r1.172 prefs.c

--- src/prefs.c 2001/07/31 23:23:40 1.172

+++ src/prefs.c 2001/08/29 08:48:39

@@ -2478,7 +2478,7 @@

dw = g_new0(struct debug_window, 1);

box = gtk_hbox_new(FALSE, 0);

- dw->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(dw->window);

gtk_window_set_title(GTK_WINDOW(dw->window), _("GAIM debug output window"));

gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");

gtk_container_add(GTK_CONTAINER(dw->window), box);

Index: src/prpl.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/prpl.c,v

retrieving revision 1.25

diff -u -r1.25 prpl.c

--- src/prpl.c 2001/08/22 21:11:58 1.25

+++ src/prpl.c 2001/08/29 08:48:39

@@ -130,7 +130,7 @@

GtkWidget *hbox;

GtkWidget *button;

- window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(window)

gtk_window_set_wmclass(GTK_WINDOW(window), "accept", "Gaim");

gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);

gtk_window_set_title(GTK_WINDOW(window), _("Accept?"));

@@ -195,7 +195,7 @@

p->doit = doit;

p->dont = dont;

- window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(window)

p->window = window;

gtk_window_set_wmclass(GTK_WINDOW(window), "prompt", "Gaim");

gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);

@@ -589,7 +589,7 @@

"overwrite the file%s or cancel the transfer?", name,

(size <= fr->size) ? ", resume the download," : "");

- window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(window)

}

Index: src/protocols/napster/napster.c

===================================================================

RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v

retrieving revision 1.6

diff -u -r1.6 napster.c

--- src/protocols/napster/napster.c 2001/08/27 07:11:49 1.6

+++ src/protocols/napster/napster.c 2001/08/29 08:48:53

@@ -166,7 +166,7 @@

struct browse_window *browse = g_new0(struct browse_window, 1);

struct nap_data *ndata = (struct nap_data *)gc->proto_data;

- browse->window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(browse->window)

browse->name = g_strdup(name);

browse->list = gtk_clist_new(1);

browse->gc = gc;

@@ -1079,7 +1079,7 @@

gchar *titles[5] = {"Mp3 Name", "Nick", "Size", "Bitrate", "Connection"};

search_dialog = g_new0(struct search_window, 1);

- window = gtk_window_new(GTK_WINDOW_DIALOG);

+ GAIM_DIALOG(window)

vbox = gtk_vbox_new(FALSE, 0);

gaim/www