callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leaks

Browse Source 
svn path=/trunk/; revision=17039
This commit is contained in:
Matthias Clasen 2007-01-03 21:23:42 +00:00
parent 198c3c61a9
commit e9f1fe16bc
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprinteroptionwidget.c (filesave_changed_cb):
Fix memory leaks.
2007-01-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkassistant.c (remove_page): If the current page

26
gtk/gtkprinteroptionwidget.c
View File

@ -453,11 +453,9 @@ filesave_changed_cb (GtkWidget *button,
GtkPrinterOptionWidget *widget)
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
gchar *uri, *directory, *path;
const gchar *file;
gchar *uri, *file;
/* TODO: how do we support nonlocal file systems? */
directory = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (priv->combo));
file = g_filename_from_utf8 (gtk_entry_get_text (GTK_ENTRY (priv->entry)),
-1, NULL, NULL, NULL);
if (file == NULL)
@ -470,24 +468,34 @@ filesave_changed_cb (GtkWidget *button,
uri = g_filename_to_uri (file, NULL, NULL);
else
{
gchar *path;
#ifdef G_OS_UNIX
if (file[0] == '~' && file[1] == '/')
{
directory = g_strdup (g_get_home_dir ());
file += 2;
path = g_build_filename (g_get_home_dir (), file + 2, NULL);
}
else
#endif
path = g_build_filename (directory, file, NULL);
{
gchar *directory;
directory = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (priv->combo));
path = g_build_filename (directory, file, NULL);
g_free (directory);
}
uri = g_filename_to_uri (path, NULL, NULL);
g_free (path);
}
if (uri)
gtk_printer_option_set (priv->source, uri);
g_free (directory);
g_free (uri);
g_free (file);
g_signal_handler_unblock (priv->source, priv->source_changed_handler);
emit_changed (widget);
@ -508,7 +516,7 @@ filter_numeric (const gchar *val,
for (i = 0, j = 0; i < len; i++)
{
if (isdigit(val[i]))
if (isdigit (val[i]))
{
filtered_val[j] = val[i];
j++;