rpms/nautilus-sendto/devel nautilus-sendto-0.7-thunderbird.patch, NONE, 1.1 nautilus-sendto.spec, 1.21, 1.22

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Sep 16 06:19:43 UTC 2006


Author: mclasen

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27158

Modified Files:
	nautilus-sendto.spec 
Added Files:
	nautilus-sendto-0.7-thunderbird.patch 
Log Message:
fix thunderbird support


nautilus-sendto-0.7-thunderbird.patch:
 configure                 |    2 +-
 src/plugins/thunderbird.c |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE nautilus-sendto-0.7-thunderbird.patch ---
--- nautilus-sendto-0.7/src/plugins/thunderbird.c.thunderbird	2006-05-27 20:52:27.000000000 -0400
+++ nautilus-sendto-0.7/src/plugins/thunderbird.c	2006-09-16 02:16:30.000000000 -0400
@@ -35,7 +35,7 @@
 	printf ("Init thunderbird plugin\n");
 	hash = g_hash_table_new (g_str_hash, g_str_equal);
 
-	t_cmd = g_find_program_in_path ("mozilla-thunderbird");
+	t_cmd = g_find_program_in_path ("thunderbird");
 	if (t_cmd == NULL)
 		return FALSE;
 	return TRUE;
@@ -73,14 +73,15 @@
 		g_string_append_printf (mailto, "to=%s,", send_to);		
 	}
 	
-	t_cmd = g_find_program_in_path ("mozilla-thunderbird");
+	t_cmd = g_find_program_in_path ("thunderbird");
 	if (t_cmd == NULL)
 		return FALSE;
 	
-	g_string_append_printf (mailto," attachment='\"%s\"'",file_list->data);
+	g_string_append_printf (mailto,"attachment='file:///%s",file_list->data);
 	for (l = file_list->next ; l; l=l->next){				
-		g_string_append_printf (mailto,",'\"%s\"'",l->data);
+		g_string_append_printf (mailto,",file:///%s",l->data);
 	}
+	g_string_append_c (mailto, '\'');
 	cmd = g_strdup_printf ("%s %s", t_cmd, mailto->str);
 	g_spawn_command_line_async (cmd, NULL);
 	g_free (cmd);
--- nautilus-sendto-0.7/configure.thunderbird	2006-06-25 09:25:10.000000000 -0400
+++ nautilus-sendto-0.7/configure	2006-09-16 02:13:01.000000000 -0400
@@ -19430,7 +19430,7 @@
 
 
 
-enable_thunderbird=no
+enable_thunderbird=yes
 
 
 if test "x$enable_thunderbird" = "xyes"; then


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nautilus-sendto.spec	14 Aug 2006 11:13:38 -0000	1.21
+++ nautilus-sendto.spec	16 Sep 2006 06:19:41 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.7
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -14,6 +14,7 @@
 BuildRequires:  gettext
 
 Patch0:		nautilus-sendto-0.7-gaim.patch
+Patch1:		nautilus-sendto-0.7-thunderbird.patch
 
 # For compat with old nautilus-sendto packaging
 Provides: nautilus-sendto-gaim
@@ -42,6 +43,7 @@
 %setup -q
 
 %patch0 -p1 -b .gaim
+%patch1 -p1 -b .thunderbird
 
 
 %build
@@ -73,6 +75,8 @@
 # no dependencies and isn't activated unless you use gaim
 %{_libdir}/gaim/nautilus.so
 %{_libdir}/nautilus-sendto/plugins/libnstgaim.so
+# same for thunderbird
+%{_libdir}/nautilus-sendto/plugins/libnstthunderbird.so
 
 
 %ifnarch s390 s390x
@@ -82,6 +86,9 @@
 %endif
 
 %changelog
+* Sat Sep 16 2006 Matthias Clasen <mclasen at redhat.com> - 0.7-5
+- Include Thunderbird support and make it work
+
 * Mon Aug 14 2006 Alexander Larsson <alexl at redhat.com> - 0.7-4
 - Buildrequire nautilus-devel
 




More information about the fedora-cvs-commits mailing list