--- a/configure.ac Sun Dec 29 02:29:03 2002 -0500
+++ b/configure.ac Thu Jan 02 14:53:05 2003 -0500
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.59.7])
+AM_INIT_AUTOMAKE([gaim], [0.59.8]) @@ -107,7 +107,6 @@
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 (BROKEN)],,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],,enable_pixbuf=yes)
AC_ARG_ENABLE(panel, [ --enable-panel compile as a GNOME applet],,enable_panel=$enable_distrib)
@@ -129,32 +128,6 @@
-if test "x$enable_gtk2" = "xyes" ; then
- dnl AM_PATH_GTK_2_0(1.3.10,[
- dnl CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN"
- dnl UI_LIBS="$UI_LIBS $GTK_LIBS"
- AC_PATH_PROG(pkgcfg, pkg-config)
- if test "x$pkgcfg" = "x" ; then
- GTK_VER=`$pkgcfg gtk+-2.0 --modversion 2>/dev/null`
- if test "x$GTK_VER" = "x" ; then
- GTK_CFLAGS=`$pkgcfg gtk+-2.0 --cflags`
- CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN"
- GTK_LIBS=`$pkgcfg gtk+-2.0 --libs`
- UI_LIBS="$UI_LIBS $GTK_LIBS"
if test "x$enable_gnome" = "xyes" ; then
if test "x$enable_panel" = "xyes" ; then
@@ -190,7 +163,7 @@
-if test "x$enable_gnome" != "xyes" -a "x$enable_gtk2" != "xyes" ; then
+if test "x$enable_gnome" != "xyes" ; then AM_PATH_GLIB(1.2.5,,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
@@ -465,16 +438,10 @@
echo UI Library.................... : GNOME Panel
elif test "x$enable_gnome" = "xyes" ; then
echo UI Library.................... : GNOME App
-elif test "x$enable_gtk2" = "xyes" ; then
- echo UI Library.................... : GTK+ 2.0
echo UI Library.................... : GTK+ 1.2
-if test "x$enable_gtk2" = "xyes" ; then
- echo Use GdkPixbuf................. : yes
- echo Use GdkPixbuf................. : $use_pixbuf
+echo Use GdkPixbuf................. : $use_pixbuf echo Build with Plugin support..... : $enable_plugins
echo Build with Perl support....... : $enable_perl
--- a/configure.in Sun Dec 29 02:29:03 2002 -0500
+++ b/configure.in Thu Jan 02 14:53:05 2003 -0500
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.59.7])
+AM_INIT_AUTOMAKE([gaim], [0.59.8]) @@ -105,7 +105,6 @@
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 (BROKEN)],,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],,enable_pixbuf=yes)
AC_ARG_ENABLE(panel, [ --enable-panel compile as a GNOME applet],,enable_panel=$enable_distrib)
@@ -127,32 +126,6 @@
-if test "x$enable_gtk2" = "xyes" ; then
- dnl AM_PATH_GTK_2_0(1.3.10,[
- dnl CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN"
- dnl UI_LIBS="$UI_LIBS $GTK_LIBS"
- AC_PATH_PROG(pkgcfg, pkg-config)
- if test "x$pkgcfg" = "x" ; then
- GTK_VER=`$pkgcfg gtk+-2.0 --modversion 2>/dev/null`
- if test "x$GTK_VER" = "x" ; then
- GTK_CFLAGS=`$pkgcfg gtk+-2.0 --cflags`
- CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN"
- GTK_LIBS=`$pkgcfg gtk+-2.0 --libs`
- UI_LIBS="$UI_LIBS $GTK_LIBS"
if test "x$enable_gnome" = "xyes" ; then
if test "x$enable_panel" = "xyes" ; then
@@ -188,7 +161,7 @@
-if test "x$enable_gnome" != "xyes" -a "x$enable_gtk2" != "xyes" ; then
+if test "x$enable_gnome" != "xyes" ; then AM_PATH_GLIB(1.2.5,,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
@@ -461,16 +434,10 @@
echo UI Library.................... : GNOME Panel
elif test "x$enable_gnome" = "xyes" ; then
echo UI Library.................... : GNOME App
-elif test "x$enable_gtk2" = "xyes" ; then
- echo UI Library.................... : GTK+ 2.0
echo UI Library.................... : GTK+ 1.2
-if test "x$enable_gtk2" = "xyes" ; then
- echo Use GdkPixbuf................. : yes
- echo Use GdkPixbuf................. : $use_pixbuf
+echo Use GdkPixbuf................. : $use_pixbuf echo Build with Plugin support..... : $enable_plugins
echo Build with Perl support....... : $enable_perl
--- a/src/conversation.c Sun Dec 29 02:29:03 2002 -0500
+++ b/src/conversation.c Thu Jan 02 14:53:05 2003 -0500
@@ -2843,14 +2843,12 @@
gtk_text_set_editable(GTK_TEXT(entry), TRUE);
gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE);
-#if !GTK_CHECK_VERSION(1,3,0) /* This gtk bug should be fixed in gtk2 */
/* I hate hackish workarounds. According to Ari Pollak, a gtk bug causes Gaim to loop
* infinitely if the entry is smaller than the text height. This is a hackish workaround */
gtk_widget_set_usize(entry, conv_size.width - 20,
MAX(conv_size.entry_height,
gdk_char_height(gtk_widget_get_default_style()->font, '0') +
gtk_widget_get_default_style()->font->ascent + 1));
gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback), c);
gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c);
--- a/src/gtkimhtml.c Sun Dec 29 02:29:03 2002 -0500
+++ b/src/gtkimhtml.c Thu Jan 02 14:53:05 2003 -0500
@@ -43,12 +43,8 @@
#include "pixmaps/broken.xpm"
-#if GTK_CHECK_VERSION(1,3,0)
-# define GTK_IMHTML_GET_STYLE_FONT(style) gtk_style_get_font (style)
-# define GTK_IMHTML_GET_STYLE_FONT(style) (style)->font
-# define GTK_CLASS_TYPE(class) (class)->type
+#define GTK_IMHTML_GET_STYLE_FONT(style) (style)->font +#define GTK_CLASS_TYPE(class) (class)->type #include "pixmaps/angel.xpm"
#include "pixmaps/bigsmile.xpm"
@@ -351,11 +347,7 @@
static gint gtk_imhtml_motion_notify_event (GtkWidget *, GdkEventMotion *);
-#if GTK_CHECK_VERSION(1,3,0)
-gtk_imhtml_finalize (GObject *object)
gtk_imhtml_destroy (GtkObject *object)
@@ -382,12 +374,8 @@
gtk_smiley_tree_destroy (imhtml->smiley_data);
-#if GTK_CHECK_VERSION(1,3,0)
- G_OBJECT_CLASS (parent_class)->finalize (object);
if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
@@ -419,13 +407,8 @@
&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;
attributes.x = widget->style->klass->xthickness + BORDER_SIZE;
attributes.y = widget->style->klass->xthickness + BORDER_SIZE;
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)
@@ -745,13 +728,8 @@
if (GTK_WIDGET_HAS_FOCUS (widget)) {
-#if GTK_CHECK_VERSION(1,3,0)
- gtk_paint_focus (widget->style, widget->window, GTK_STATE_NORMAL, NULL, widget, "text",
- 0, 0, widget->allocation.width - 1, widget->allocation.height - 1);
gtk_paint_focus (widget->style, widget->window, NULL, widget, "text", 0, 0,
widget->allocation.width - 1, widget->allocation.height - 1);
x = 1; y = 1; w = 2; h = 2;
@@ -768,11 +746,7 @@
-#if GTK_CHECK_VERSION(1,3,0)
x = GTK_LAYOUT (imhtml)->hadjustment->value;
y = GTK_LAYOUT (imhtml)->vadjustment->value;
@@ -825,7 +799,6 @@
gtk_imhtml_draw_focus (GTK_WIDGET (imhtml));
-#if !GTK_CHECK_VERSION(1,3,0)
gtk_imhtml_draw (GtkWidget *widget,
@@ -835,7 +808,6 @@
imhtml = GTK_IMHTML (widget);
gtk_imhtml_draw_exposed (imhtml);
gtk_imhtml_style_set (GtkWidget *widget,
@@ -982,22 +954,6 @@
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);
new_xsize = MAX (1, (gint) allocation->width -
(gint) (widget->style->klass->xthickness + BORDER_SIZE) * 2);
new_ysize = MAX (1, (gint) allocation->height -
@@ -1012,7 +968,6 @@
gdk_window_move_resize (layout->bin_window,
x, y, new_xsize, new_ysize);
layout->hadjustment->page_size = new_xsize;
layout->hadjustment->page_increment = new_xsize / 2;
@@ -2009,16 +1964,10 @@
gtk_imhtml_class_init (GtkIMHtmlClass *class)
-#if GTK_CHECK_VERSION(1,3,0)
- GObjectClass *gobject_class;
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkLayoutClass *layout_class;
-#if GTK_CHECK_VERSION(1,3,0)
- gobject_class = (GObjectClass*) class;
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
layout_class = (GtkLayoutClass*) class;
@@ -2034,19 +1983,13 @@
-#if GTK_CHECK_VERSION(1,3,0)
- gobject_class->finalize = gtk_imhtml_finalize;
gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
object_class->destroy = gtk_imhtml_destroy;
widget_class->realize = gtk_imhtml_realize;
-#if !GTK_CHECK_VERSION(1,3,0)
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;
@@ -2082,12 +2025,8 @@
gtk_imhtml_get_font_name (GdkFont *font)
-#if GTK_CHECK_VERSION(1,3,0)
- return "--*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*";
GdkFontPrivate *fontpriv = (GdkFontPrivate *) font;
return fontpriv->names->data;
@@ -3567,17 +3506,6 @@
gtk_widget_set_usize (GTK_WIDGET (imhtml), -1, imhtml->y);
-#if GTK_CHECK_VERSION(1,3,0)
- if (!(options & GTK_IMHTML_NO_SCROLL) &&
- (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 +
if (!(options & GTK_IMHTML_NO_SCROLL) &&
@@ -3587,7 +3515,6 @@
MAX (1, (GTK_WIDGET (imhtml)->allocation.height -
(GTK_WIDGET (imhtml)->style->klass->ythickness +