From d0ef4dec8156e0eae6ef9370ff78ebdc03670d65 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 23 Aug 2005 12:48:05 +0000 Subject: [PATCH] Fix a C99ism. (#314262, Robert Jeff Mitchell) 2005-08-23 Matthias Clasen * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Fix a C99ism. (#314262, Robert Jeff Mitchell) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilechooserdefault.c | 3 ++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a005b9bc9..f932582284 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-23 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Fix a + C99ism. (#314262, Robert Jeff Mitchell) + 2005-08-22 Manish Singh * gtk/gtkicontheme.h: add declaration for _gtk_icon_theme_check_reload. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7a005b9bc9..f932582284 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-23 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Fix a + C99ism. (#314262, Robert Jeff Mitchell) + 2005-08-22 Manish Singh * gtk/gtkicontheme.h: add declaration for _gtk_icon_theme_check_reload. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7a005b9bc9..f932582284 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-08-23 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Fix a + C99ism. (#314262, Robert Jeff Mitchell) + 2005-08-22 Manish Singh * gtk/gtkicontheme.h: add declaration for _gtk_icon_theme_check_reload. diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 786a251952..2bed6802a4 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1434,6 +1434,7 @@ static void shortcuts_append_desktop (GtkFileChooserDefault *impl) { char *name; + const char *home; GtkFilePath *path; profile_start ("start", NULL); @@ -1441,7 +1442,7 @@ shortcuts_append_desktop (GtkFileChooserDefault *impl) #ifdef G_OS_WIN32 name = _gtk_file_system_win32_get_desktop (); #else - const char *home = g_get_home_dir (); + home = g_get_home_dir (); if (home == NULL) { profile_end ("end - no home directory!?", NULL);