[gnome-commander/gcmd-1-2-8: 6/9] Fixed problem #587325 (crash in a clean chroot environment)

[Piotr Eljasiak <epiotr src gnome org>]

commit f9e76a9704f147f8edd638e8070a098110feeffb
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Mon Aug 10 18:08:11 2009 +0200

    Fixed problem #587325 (crash in a clean chroot environment)

 NEWS                             |    2 +-
 doc/C/gnome-commander.xml        |    2 +-
 src/gnome-cmd-bookmark-dialog.cc |    2 +-
 src/gnome-cmd-main-menu.cc       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 0045adf..8db4135 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ gnome-commander 1.2.8.1
 ---------------
 
 Bug fixes:
- * Fixed problem #... (...)
+ * Fixed problem #587325 (crash in a clean chroot environment)
 
 
 ===================================
diff --git a/doc/C/gnome-commander.xml b/doc/C/gnome-commander.xml
index b377b65..c60964d 100644
--- a/doc/C/gnome-commander.xml
+++ b/doc/C/gnome-commander.xml
@@ -5982,7 +5982,7 @@
                 <para>
                     <itemizedlist>
                         <listitem>
-                            <para>Fixed problem #375357 (crash when cancelling calculation of dir properties)</para>
+                            <para>Fixed problem #587325 (crash in a clean chroot environment)</para>
                         </listitem>
                     </itemizedlist>
                 </para>
diff --git a/src/gnome-cmd-bookmark-dialog.cc b/src/gnome-cmd-bookmark-dialog.cc
index 63547f2..01cd823 100644
--- a/src/gnome-cmd-bookmark-dialog.cc
+++ b/src/gnome-cmd-bookmark-dialog.cc
@@ -400,7 +400,7 @@ static void add_bookmarks (GnomeCmdBookmarkDialog *dialog)
         GnomeCmdCon *con = (GnomeCmdCon *) all_cons->data;
         group = gnome_cmd_con_get_bookmarks (con);
 
-        if (group->bookmarks)
+        if (group && group->bookmarks)
         {
             group->data = (gpointer *) dialog;
             dialog->priv->groups = g_list_append (dialog->priv->groups, group);
diff --git a/src/gnome-cmd-main-menu.cc b/src/gnome-cmd-main-menu.cc
index 50a2625..24d6202 100644
--- a/src/gnome-cmd-main-menu.cc
+++ b/src/gnome-cmd-main-menu.cc
@@ -1003,7 +1003,7 @@ void gnome_cmd_main_menu_update_bookmarks (GnomeCmdMainMenu *main_menu)
         GnomeCmdCon *con = GNOME_CMD_CON (cons->data);
         GnomeCmdBookmarkGroup *group = gnome_cmd_con_get_bookmarks (con);
         GtkMenuShell *bookmarks_menu = GTK_MENU_SHELL (GTK_MENU_ITEM (main_menu->priv->bookmarks_menu)->submenu);
-        if (group->bookmarks)
+        if (group && group->bookmarks)
             add_bookmark_group (main_menu, bookmarks_menu, group);
     }
 }