Re: [evolution-patches] Please review my patch for bug #47781

[Antonio Xu <antonio xu sun com>]

Hello Not Zed

Thanks for you reviewing my patch, I have created a new patch according 
to your advice. Please review it.

Regards
Anto
Not Zed wrote:

> This patch isn't right, you should simply just remove the /evolution/
> part of the filename string.
>
> That e_shell* stuff is only for the shell and not used anywhere else.
>
> PS don't cc evolution-mail-maintainers, that list is for bugzilla only.
>
> On Thu, 2003-08-21 at 01:04, Antonio Xu wrote:
>  
>
> > Hello All,
> >
> > Could you review my patch for bug #47781?
> > I found composer default icon path was hard code in e-msg-composer.c, so 
> > I use e_shell_get_icon_path to get icon path.
> >
> > Bug Summary:Evolution composer lost default windows icon
> > Bug URL:http://bugzilla.ximian.com/show_bug.cgi?id=47781
> >
> > Thanks
> > Antonio Xu
> >
> >
> >
> >
> >
> >
> >
> >
> >
> > ______________________________________________________________________
> > Index: composer/ChangeLog
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
> > retrieving revision 1.544.2.10
> > diff -p -u -r1.544.2.10 ChangeLog
> > --- composer/ChangeLog	4 Aug 2003 13:30:25 -0000	1.544.2.10
> > +++ composer/ChangeLog	21 Aug 2003 03:52:20 -0000
> > @@ -1,3 +1,8 @@
> > +2003-08-21  Antonio Xu  <antonio xu sun com>
> > +
> > +	* e-msg-composer.c (create_composer): use e_shell_get_icon_path
> > +	to get the path of composer icon. [#47781]
> > +
> > 2003-07-31  Antonio Xu  <antonio xu sun com>
> >
> > 	* e-msg-composer.c (drag_data_received): add the drop type of
> > Index: composer/e-msg-composer.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
> > retrieving revision 1.395.2.5
> > diff -p -u -r1.395.2.5 e-msg-composer.c
> > --- composer/e-msg-composer.c	4 Aug 2003 13:30:25 -0000	1.395.2.5
> > +++ composer/e-msg-composer.c	21 Aug 2003 03:53:35 -0000
> > @@ -2907,6 +2907,7 @@ create_composer (int visible_mask)
> > 	CORBA_Environment ev;
> > 	GConfClient *gconf;
> > 	int vis;
> > +	char *icon_name = NULL;
> > 	
> > 	composer = g_object_new (E_TYPE_MSG_COMPOSER, "win_name", _("Compose a message"), NULL);
> > 	gtk_window_set_title ((GtkWindow *) composer, _("Compose a message"));
> > @@ -2922,9 +2923,12 @@ create_composer (int visible_mask)
> > 	
> > 	gtk_window_set_default_size (GTK_WINDOW (composer),
> > 				     DEFAULT_WIDTH, DEFAULT_HEIGHT);
> > -	gnome_window_icon_set_from_file (GTK_WINDOW (composer), EVOLUTION_DATADIR
> > -					 "/images/evolution/compose-message.png");
> > -	
> > +	icon_name = e_shell_get_icon_path ("compose-message.png", FALSE);
> > +	if (icon_name) {
> > +		gnome_window_icon_set_from_file (GTK_WINDOW (composer), icon_name);
> > +		g_free(icon_name);
> > +	}
> > +
> > 	/* DND support */
> > 	gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,
> > 			   drop_types, num_drop_types, GDK_ACTION_COPY);
> >    
>
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches
>  


Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.395.2.5
diff -p -u -r1.395.2.5 e-msg-composer.c
--- composer/e-msg-composer.c	4 Aug 2003 13:30:25 -0000	1.395.2.5
+++ composer/e-msg-composer.c	27 Aug 2003 03:53:21 -0000
@@ -2922,9 +2922,9 @@ create_composer (int visible_mask)
 	
 	gtk_window_set_default_size (GTK_WINDOW (composer),
 				     DEFAULT_WIDTH, DEFAULT_HEIGHT);
-	gnome_window_icon_set_from_file (GTK_WINDOW (composer), EVOLUTION_DATADIR
-					 "/images/evolution/compose-message.png");
-	
+	gnome_window_icon_set_from_file (GTK_WINDOW (composer), EVOLUTION_IMAGESDIR
+					 "/compose-message.png");
+
 	/* DND support */
 	gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,
 			   drop_types, num_drop_types, GDK_ACTION_COPY);
Index: composer/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.544.2.10
diff -p -u -r1.544.2.10 ChangeLog
--- composer/ChangeLog	4 Aug 2003 13:30:25 -0000	1.544.2.10
+++ composer/ChangeLog	27 Aug 2003 03:56:42 -0000
@@ -1,3 +1,9 @@
+2003-08-21  Antonio Xu  <antonio xu sun com>
+
+	* e-msg-composer.c (create_composer): use EVOLUTION_IMAGESDIR
+	and composer icon name to get the path of composer icon.
+	[#47781]
+
 2003-07-31  Antonio Xu  <antonio xu sun com>
 
 	* e-msg-composer.c (drag_data_received): add the drop type of