Accepting request 227398 from home:mgorse:branches:GNOME:Factory
- Fix memory leak in gtk2-print-to-file.patch (bnc#839089 bgo#711177). OBS-URL: https://build.opensuse.org/request/show/227398 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=203
This commit is contained in:
parent
01eddd6009
commit
7d392d52f3
@ -1,4 +1,4 @@
|
||||
From 2ce26e146b7b8fad6de7d4087479a4b69941aa5e Mon Sep 17 00:00:00 2001
|
||||
From 5ae4ef471d732cd5937c67829eec677b477cb8ed Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gorse <mgorse@suse.com>
|
||||
Date: Wed, 30 Oct 2013 15:42:09 -0500
|
||||
Subject: [PATCH] Print to a file in the current directory by default
|
||||
@ -8,22 +8,25 @@ directory was not specified.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=711177
|
||||
---
|
||||
gtk/gtkprinteroptionwidget.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
gtk/gtkprinteroptionwidget.c | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
|
||||
index 2f43edf..12fdd6f 100644
|
||||
index 2f43edf..08c2aff 100644
|
||||
--- a/gtk/gtkprinteroptionwidget.c
|
||||
+++ b/gtk/gtkprinteroptionwidget.c
|
||||
@@ -521,7 +521,13 @@ filesave_changed_cb (GtkWidget *button,
|
||||
@@ -521,7 +521,16 @@ filesave_changed_cb (GtkWidget *button,
|
||||
if (g_uri_parse_scheme (file) != NULL)
|
||||
uri = g_strdup (file);
|
||||
else
|
||||
- uri = g_build_path ("/", gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->combo)), file, NULL);
|
||||
+ {
|
||||
+ const gchar *chooser_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->combo));
|
||||
+ gchar *chooser_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->combo));
|
||||
+ if (chooser_uri)
|
||||
+ uri = g_build_path ("/", chooser_uri, file, NULL);
|
||||
+ {
|
||||
+ uri = g_build_path ("/", chooser_uri, file, NULL);
|
||||
+ g_free (chooser_uri);
|
||||
+ }
|
||||
+ else
|
||||
+ uri = g_filename_to_uri (file, NULL, NULL);
|
||||
+ }
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 24 22:00:44 UTC 2014 - mgorse@suse.com
|
||||
|
||||
- Fix memory leak in gtk2-print-to-file.patch (bnc#839089 bgo#711177).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 18 09:32:23 UTC 2014 - dimstar@opensuse.org
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user