Re: [evolution-patches] fix for previous composer fix

[Not Zed <notzed ximian com>]

Why the change of the g_type_class_add_private call?  The "gobject_class" is the same pointer as klass, only it has been cast.

The other fix is good.


On Tue, 2005-02-15 at 16:23 -0500, Jeffrey Stedfast wrote:

I didn't catch this bug (or the bug about 'i' not being declared) for
the case where USE_GTKFILECHOOSER wasn't defined since I only compiled
with the defaults on my laptop when reviewing so I guess shame on me.

Anyways, this week I'm back on my workstation and found this bug
yesterday while trying to send a patch in for review (this machine uses
gtkfilesel instead of gtkfilechooser).

text/plain attachment (composer.patch)

? composer.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.681
diff -u -r1.681 ChangeLog
--- ChangeLog	10 Feb 2005 04:34:29 -0000	1.681
+++ ChangeLog	15 Feb 2005 21:24:24 -0000
@@ -1,3 +1,8 @@
+2005-02-15  Jeffrey Stedfast  <fejj novell com>
+
+	* e-msg-composer-select-file.c (select_attach_response): Fix
+	previous patch for the !USE_GTKFILECHOOSER case.
+
 2005-02-10  Not Zed  <NotZed Ximian com>
 
 	** See bug #66126.
Index: e-msg-composer-select-file.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-select-file.c,v
retrieving revision 1.31
diff -u -r1.31 e-msg-composer-select-file.c
--- e-msg-composer-select-file.c	14 Feb 2005 18:31:47 -0000	1.31
+++ e-msg-composer-select-file.c	15 Feb 2005 21:24:25 -0000
@@ -202,7 +202,7 @@
 		names = NULL;
 		if ((files = gtk_file_selection_get_selections (GTK_FILE_SELECTION (selector)))) {
 			for (i = 0; files[i]; i++)
-				g_slist_prepend(names, files[i]);
+				names = g_slist_prepend(names, files[i]);
 			
 			g_free (files);
 			names = g_slist_reverse(names);
Index: e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.498
diff -u -r1.498 e-msg-composer.c
--- e-msg-composer.c	10 Feb 2005 04:34:29 -0000	1.498
+++ e-msg-composer.c	15 Feb 2005 21:24:25 -0000
@@ -3003,7 +3003,7 @@
 	object_class = GTK_OBJECT_CLASS (klass);
 	widget_class = GTK_WIDGET_CLASS (klass);
 
-	g_type_class_add_private(gobject_class, sizeof(struct _EMsgComposerPrivate));
+	g_type_class_add_private(klass, sizeof(struct _EMsgComposerPrivate));
 	
 	gobject_class->finalize = composer_finalise;
 	gobject_class->dispose = composer_dispose;