diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-06-20 18:36:16 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-06-20 18:36:16 +0000 |
| commit | 2c59ab145d2c61e6a960b2e420dea98e31613281 (patch) | |
| tree | b7c7f7f4e923a86abc72e73bce2c1f9cdf55fdf2 | |
| parent | c5bae1f7e3e911f92e7a2ddf6264302622107e24 (diff) | |
bugfix: handle NULL pointer correct,
if gtk_file_chooser_get_filename returned NULL
svn path=/trunk/; revision=11197
| -rw-r--r-- | gtk/file_dlg.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index bd2c83120b..46a0584bdc 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.118 2004/06/20 15:57:09 ulfl Exp $ + * $Id: file_dlg.c,v 1.119 2004/06/20 18:36:16 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -138,7 +138,7 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name) guint64 filesize; label = OBJECT_GET_DATA(prev, PREVIEW_FILENAME_KEY); - gtk_label_set_text(GTK_LABEL(label), get_basename((char *)cf_name)); + gtk_label_set_text(GTK_LABEL(label), "-"); label = OBJECT_GET_DATA(prev, PREVIEW_FORMAT_KEY); gtk_label_set_text(GTK_LABEL(label), "-"); label = OBJECT_GET_DATA(prev, PREVIEW_SIZE_KEY); @@ -150,6 +150,13 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name) label = OBJECT_GET_DATA(prev, PREVIEW_FIRST_KEY); gtk_label_set_text(GTK_LABEL(label), "-"); + if(!cf_name) { + return FALSE; + } + + label = OBJECT_GET_DATA(prev, PREVIEW_FILENAME_KEY); + gtk_label_set_text(GTK_LABEL(label), get_basename((char *)cf_name)); + if (test_for_directory(cf_name) == EISDIR) { label = OBJECT_GET_DATA(prev, PREVIEW_FORMAT_KEY); gtk_label_set_text(GTK_LABEL(label), "directory"); |