| 1 |
pacho 10/09/01 15:43:28 |
| 2 |
|
| 3 |
Added: nautilus-sendto-2.28.5-fix-memleaks.patch |
| 4 |
nautilus-sendto-2.28.5-commandline-help.patch |
| 5 |
Log: |
| 6 |
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). |
| 7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: nautilus-sendto-2.28.5-fix-memleaks.patch |
| 16 |
=================================================================== |
| 17 |
From 52a1a4433dd5087baed79f948aec96aab409e3d2 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Bastien Nocera <hadess@××××××.net> |
| 19 |
Date: Mon, 16 Aug 2010 15:21:05 +0000 |
| 20 |
Subject: Fix a few memory leaks |
| 21 |
|
| 22 |
On startup, and when sending packed files |
| 23 |
|
| 24 |
https://bugzilla.gnome.org/show_bug.cgi?id=626754 |
| 25 |
--- |
| 26 |
diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c |
| 27 |
index 92b96bb..4dcbb1a 100644 |
| 28 |
--- a/src/nautilus-sendto-command.c |
| 29 |
+++ b/src/nautilus-sendto-command.c |
| 30 |
@@ -265,7 +265,7 @@ status_label_clear (gpointer data) |
| 31 |
static void |
| 32 |
send_button_cb (GtkWidget *widget, NS_ui *ui) |
| 33 |
{ |
| 34 |
- char *f, *error; |
| 35 |
+ char *error; |
| 36 |
NstPlugin *p; |
| 37 |
GtkWidget *w; |
| 38 |
|
| 39 |
@@ -305,11 +305,14 @@ send_button_cb (GtkWidget *widget, NS_ui *ui) |
| 40 |
NAUTILUS_SENDTO_LAST_MEDIUM, p->info->id, NULL); |
| 41 |
|
| 42 |
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui->pack_checkbutton))){ |
| 43 |
+ char *f; |
| 44 |
+ |
| 45 |
f = pack_files (ui); |
| 46 |
if (f != NULL) { |
| 47 |
GList *packed_file = NULL; |
| 48 |
packed_file = g_list_append (packed_file, f); |
| 49 |
if (!p->info->send_files (p, w, packed_file)) { |
| 50 |
+ g_free (f); |
| 51 |
g_list_free (packed_file); |
| 52 |
return; |
| 53 |
} |
| 54 |
@@ -318,6 +321,7 @@ send_button_cb (GtkWidget *widget, NS_ui *ui) |
| 55 |
gtk_widget_set_sensitive (ui->dialog, TRUE); |
| 56 |
return; |
| 57 |
} |
| 58 |
+ g_free (f); |
| 59 |
} else { |
| 60 |
if (!p->info->send_files (p, w, file_list)) { |
| 61 |
g_list_foreach (file_list, (GFunc) g_free, NULL); |
| 62 |
@@ -763,6 +767,7 @@ nautilus_sendto_init (void) |
| 63 |
|
| 64 |
file = g_file_new_for_commandline_arg (filenames[i]); |
| 65 |
filename = g_file_get_path (file); |
| 66 |
+ g_object_unref (file); |
| 67 |
if (filename == NULL) |
| 68 |
continue; |
| 69 |
|
| 70 |
-- |
| 71 |
cgit v0.8.3.1 |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.1 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch |
| 76 |
|
| 77 |
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 |
| 78 |
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 |
| 79 |
|
| 80 |
Index: nautilus-sendto-2.28.5-commandline-help.patch |
| 81 |
=================================================================== |
| 82 |
From aff367791fdd6535021fd0c95ecf2067363073c2 Mon Sep 17 00:00:00 2001 |
| 83 |
From: Matthias Clasen <mclasen@××××××.com> |
| 84 |
Date: Tue, 31 Aug 2010 15:49:00 +0000 |
| 85 |
Subject: Fix command-line help glitch |
| 86 |
|
| 87 |
nautilus-sendo --help says |
| 88 |
|
| 89 |
Usage: |
| 90 |
nautilus-sendto [OPTION...] [FILES...] nautilus-sendto |
| 91 |
|
| 92 |
The second 'nautilus-sendto' here is redundant and confusing. With the |
| 93 |
patch below, it says just |
| 94 |
|
| 95 |
Usage: |
| 96 |
nautilus-sendto [OPTION...] [FILES...] |
| 97 |
which is the intended output |
| 98 |
|
| 99 |
https://bugzilla.gnome.org/show_bug.cgi?id=627849 |
| 100 |
--- |
| 101 |
diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c |
| 102 |
index 4dcbb1a..722386c 100644 |
| 103 |
--- a/src/nautilus-sendto-command.c |
| 104 |
+++ b/src/nautilus-sendto-command.c |
| 105 |
@@ -804,7 +804,7 @@ int main (int argc, char **argv) |
| 106 |
textdomain (GETTEXT_PACKAGE); |
| 107 |
|
| 108 |
g_thread_init (NULL); |
| 109 |
- context = g_option_context_new ("nautilus-sendto"); |
| 110 |
+ context = g_option_context_new (""); |
| 111 |
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); |
| 112 |
g_option_context_add_group (context, gtk_get_option_group (TRUE)); |
| 113 |
if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) { |
| 114 |
-- |
| 115 |
cgit v0.8.3.1 |
Archives