Re: [evolution-patches] remvoe gtk 2.2-isms

[Rodrigo Moya <rodrigo ximian com>]

On Thu, 2003-07-03 at 01:05, Rodney Dawes wrote:
> Patch looks good, but shouldn't you use gdk_pixbuf_unref () for pixbufs
> instead of g_object_unref ()?
> 
gdk_pixbuf_unref just does a call to g_object_unref, but yes, for
consistency, here's the updated patch.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1802.2.9
diff -u -p -r1.1802.2.9 ChangeLog
--- ChangeLog	2 Jul 2003 01:36:30 -0000	1.1802.2.9
+++ ChangeLog	2 Jul 2003 23:24:07 -0000
@@ -1,3 +1,9 @@
+2003-07-02  Rodrigo Moya <rodrigo ximian com>
+
+	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog): use
+	gtk_window_set_icon instead of gtk_window_set_icon_from_file, which
+	is 2.2.
+
 2003-07-02  Bolian Yin <bolian yin sun com>
                                                                                 
         Fixes #45328, #45329
Index: gui/alarm-notify/alarm-notify-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v
retrieving revision 1.21.4.1
diff -u -p -r1.21.4.1 alarm-notify-dialog.c
--- gui/alarm-notify/alarm-notify-dialog.c	27 Jun 2003 08:59:35 -0000	1.21.4.1
+++ gui/alarm-notify/alarm-notify-dialog.c	2 Jul 2003 23:24:08 -0000
@@ -318,6 +318,7 @@ alarm_notify_dialog (time_t trigger, tim
 	GtkHTMLStream *stream;
 	icaltimezone *current_zone;
 	char *buf, *title;
+	GdkPixbuf *pixbuf;
 
 	g_return_val_if_fail (trigger != -1, NULL);
 
@@ -397,7 +398,10 @@ alarm_notify_dialog (time_t trigger, tim
 		gtk_widget_realize (an->dialog);
 
 	gtk_window_stick (GTK_WINDOW (an->dialog));
-	gtk_window_set_icon_from_file (GTK_WINDOW (an->dialog), EVOLUTION_IMAGESDIR "/alarm.png", NULL);
+
+	pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/alarm.png", NULL);
+	gtk_window_set_icon (GTK_WINDOW (an->dialog), pixbuf);
+	gdk_pixbuf_unref (pixbuf);
 
 	gtk_widget_show (an->dialog);
 	return an;