[gentoo-commits] gentoo-x86 commit in gnome-extra/nautilus-sendto/files: nautilus-sendto-2.28.5-fix-memleaks.patch nautilus-sendto-2.28.5-commandline-help.patch

[gentoo-commits] gentoo-x86 commit in gnome-extra/nautilus-sendto/files: nautilus-sendto-2.28.5-fix-memleaks.patch nautilus-sendto-2.28.5-commandline-help.patch

[Pacho Ramos (pacho)]

pacho       10/09/01 15:43:28

  Added:                nautilus-sendto-2.28.5-fix-memleaks.patch
                        nautilus-sendto-2.28.5-commandline-help.patch
  Log:
  Version bump with most of fixes already included in 2.28.4-r1 and updated translations. This also fixes important segfaults suffered by me with gnome-bluetooth and empathy plugins (upstream bug #626362).
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch?rev=1.1&content-type=text/plain

Index: nautilus-sendto-2.28.5-fix-memleaks.patch
===================================================================
From 52a1a4433dd5087baed79f948aec96aab409e3d2 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 16 Aug 2010 15:21:05 +0000
Subject: Fix a few memory leaks

On startup, and when sending packed files

https://bugzilla.gnome.org/show_bug.cgi?id=626754
---
diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
index 92b96bb..4dcbb1a 100644
--- a/src/nautilus-sendto-command.c
+++ b/src/nautilus-sendto-command.c
@@ -265,7 +265,7 @@ status_label_clear (gpointer data)
 static void
 send_button_cb (GtkWidget *widget, NS_ui *ui)
 {
-	char *f, *error;
+	char *error;
 	NstPlugin *p;
 	GtkWidget *w;
 
@@ -305,11 +305,14 @@ send_button_cb (GtkWidget *widget, NS_ui *ui)
 				NAUTILUS_SENDTO_LAST_MEDIUM, p->info->id, NULL);
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui->pack_checkbutton))){
+		char *f;
+
 		f = pack_files (ui);
 		if (f != NULL) {
 			GList *packed_file = NULL;		
 			packed_file = g_list_append (packed_file, f);
 			if (!p->info->send_files (p, w, packed_file)) {
+				g_free (f);
 				g_list_free (packed_file);
 				return;
 			}
@@ -318,6 +321,7 @@ send_button_cb (GtkWidget *widget, NS_ui *ui)
 			gtk_widget_set_sensitive (ui->dialog, TRUE);
 			return;
 		}
+		g_free (f);
 	} else {
 		if (!p->info->send_files (p, w, file_list)) {
 			g_list_foreach (file_list, (GFunc) g_free, NULL);
@@ -763,6 +767,7 @@ nautilus_sendto_init (void)
 
 		file = g_file_new_for_commandline_arg (filenames[i]);
 		filename = g_file_get_path (file);
+		g_object_unref (file);
 		if (filename == NULL)
 			continue;
 
--
cgit v0.8.3.1



1.1                  gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch?rev=1.1&content-type=text/plain

Index: nautilus-sendto-2.28.5-commandline-help.patch
===================================================================
From aff367791fdd6535021fd0c95ecf2067363073c2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 31 Aug 2010 15:49:00 +0000
Subject: Fix command-line help glitch

nautilus-sendo --help says

Usage:
nautilus-sendto [OPTION...] [FILES...] nautilus-sendto

The second 'nautilus-sendto' here is redundant and confusing. With the
patch below, it says just

Usage:
nautilus-sendto [OPTION...] [FILES...]
which is the intended output

https://bugzilla.gnome.org/show_bug.cgi?id=627849
---
diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
index 4dcbb1a..722386c 100644
--- a/src/nautilus-sendto-command.c
+++ b/src/nautilus-sendto-command.c
@@ -804,7 +804,7 @@ int main (int argc, char **argv)
 	textdomain (GETTEXT_PACKAGE);
 
 	g_thread_init (NULL);
-	context = g_option_context_new ("nautilus-sendto");
+	context = g_option_context_new ("");
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
--
cgit v0.8.3.1