--- a/ChangeLog	Wed Mar 10 15:30:41 2004 +0000
+++ b/ChangeLog	Wed Mar 10 16:16:04 2004 +0000
@@ -1,6 +1,12 @@
 2004-03-10  Niall Power  <[email protected]>
 
-	* glib.spec: bump to 2.3.6 and remove unused patch.
+	* gtk2.spec: bump to 2.3.5 and update deps.
+	* patches/gtk+-01-window-icons-for-message-dialog.diff: ported to
+	  new version
+
+2004-03-10  Niall Power  <[email protected]>
+
+	* glib2.spec: bump to 2.3.6 and remove unused patch.
 	* patches/glib-02-gmessages_va_arg.diff: Removed. It
 	  wasn't being applied and nor should it be.
 

--- a/gtk2.spec	Wed Mar 10 15:30:41 2004 +0000
+++ b/gtk2.spec	Wed Mar 10 16:16:04 2004 +0000
@@ -1,8 +1,8 @@
 Name:         gtk2
 License:      LGPL
 Group:        System/Libraries
-Version:      2.3.2
-Release:      7
+Version:      2.3.6
+Release:      0
 Distribution: Cinnabar
 Vendor:	      Sun Microsystems, Inc.
 Summary:      GTK+ - GIMP Toolkit Library for creation of graphical user interfaces
@@ -27,9 +27,9 @@
 Autoreqprov:  on
 Prereq:       /sbin/ldconfig
 
-%define atk_version 1.4.0
-%define pango_version 1.2.5
-%define glib2_version 2.3.2
+%define atk_version 1.5.4
+%define pango_version 1.3.5
+%define glib2_version 2.3.6
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -143,6 +143,9 @@
 %{_mandir}/man3/*
 
 %changelog -n gtk2
+* Wed Mar 10 2004 - <[email protected]>
+- Bump to 2.3.6, update dependenciy versions.
+
 * Tue Feb 10 2004 - <[email protected]>
 - Bump to 2.3.2, and l10n to 0.7, and port patch 05
 

--- a/patches/gtk+-01-window-icons-for-message-dialog.diff	Wed Mar 10 15:30:41 2004 +0000
+++ b/patches/gtk+-01-window-icons-for-message-dialog.diff	Wed Mar 10 16:16:04 2004 +0000
@@ -1,11 +1,6 @@
-Index: gtk/gtkmessagedialog.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkmessagedialog.c,v
-retrieving revision 1.13
-diff -u -p -r1.13 gtkmessagedialog.c
---- gtk+-2.2.1/gtk/gtkmessagedialog.c	11 Oct 2002 22:57:11 -0000	1.13
-+++ gtk+-2.2.1-hackedgtk/gtkmessagedialog.c	7 Jul 2003 15:48:18 -0000
-@@ -185,6 +185,22 @@ gtk_message_dialog_get_message_type (Gtk
+--- gtk+-2.3.6/gtk/gtkmessagedialog.c	2004-03-06 18:55:00.000000000 +0000
++++ gtk+-2.3.6.new/gtk/gtkmessagedialog.c	2004-03-10 15:56:39.000000000 +0000
+@@ -207,6 +207,22 @@ gtk_message_dialog_get_message_type (Gtk
  }
  
  static void
@@ -28,7 +23,7 @@
  setup_type (GtkMessageDialog *dialog,
  	    GtkMessageType    type)
  {
-@@ -222,6 +238,8 @@ setup_type (GtkMessageDialog *dialog,
+@@ -244,6 +260,8 @@ setup_type (GtkMessageDialog *dialog,
        gtk_image_set_from_stock (GTK_IMAGE (dialog->image), stock_id,
                                  GTK_ICON_SIZE_DIALOG);
        
@@ -37,13 +32,14 @@
        gtk_window_set_title (GTK_WINDOW (dialog), item.label);
      }
    else
-@@ -404,19 +422,22 @@ static void
+@@ -557,21 +575,24 @@ static void
  gtk_message_dialog_style_set (GtkWidget *widget,
                                GtkStyle  *prev_style)
  {
 -  GtkWidget *parent;
 +  GtkWidget *image;
    gint border_width = 0;
+   gboolean use_separator;
  
 -  parent = GTK_WIDGET (GTK_MESSAGE_DIALOG (widget)->image->parent);
 +  image = GTK_MESSAGE_DIALOG (widget)->image;
@@ -58,9 +54,10 @@
 +      gtk_container_set_border_width (GTK_CONTAINER (image->parent),
                                        border_width);
      }
-+
+ 
 +  set_window_icon_from_stock (GTK_MESSAGE_DIALOG (widget),
-+			      GTK_IMAGE (image)->data.stock.stock_id);
- 
-   if (GTK_WIDGET_CLASS (parent_class)->style_set)
-     (GTK_WIDGET_CLASS (parent_class)->style_set) (widget, prev_style);
++			     GTK_IMAGE (image)->data.stock.stock_id);
++
+   gtk_widget_style_get (widget,
+ 			"use_separator", &use_separator,
+ 			NULL);