gnome-commander r2377 - in branches/gcmd-1-3: . doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Fri Jan  2 17:12:48 2009
New Revision: 2377
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2377&view=rev

Log:
Fixed problem #556664 (bookmarks can not be saved for mounted devices)

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/doc/C/gnome-commander.xml
   branches/gcmd-1-3/src/gnome-cmd-bookmark-dialog.cc

Modified: branches/gcmd-1-3/doc/C/gnome-commander.xml
==============================================================================
--- branches/gcmd-1-3/doc/C/gnome-commander.xml	(original)
+++ branches/gcmd-1-3/doc/C/gnome-commander.xml	Fri Jan  2 17:12:48 2009
@@ -5839,6 +5839,9 @@
                             <para>Fixed problem #554598 (GNOME Goal: LINGUAS)</para>
                         </listitem>
                         <listitem>
+                            <para>Fixed problem #556664 (bookmarks can not be saved for mounted devices)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem with setting equal pane size in horizontal mode</para>
                         </listitem>
                     </itemizedlist>

Modified: branches/gcmd-1-3/src/gnome-cmd-bookmark-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-bookmark-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-bookmark-dialog.cc	Fri Jan  2 17:12:48 2009
@@ -555,9 +555,10 @@
 
 static gboolean on_new_bookmark_ok (GnomeCmdStringDialog *string_dialog, const gchar **values, gpointer data)
 {
-    GnomeCmdBookmark *bookmark = g_new0 (GnomeCmdBookmark, 1);
-    GnomeCmdCon *con = gnome_cmd_main_win_get_fs (main_win, ACTIVE)->get_connection();
+    GnomeCmdFileSelector *fs = gnome_cmd_main_win_get_fs (main_win, ACTIVE);
+    GnomeCmdCon *con = fs->is_local() ? get_home_con () : fs->get_connection();
     GnomeCmdBookmarkGroup *group = gnome_cmd_con_get_bookmarks (con);
+    GnomeCmdBookmark *bookmark = g_new0 (GnomeCmdBookmark, 1);
 
     bookmark->name = g_strdup (values[0]);
     bookmark->path = g_strdup (values[1]);
@@ -574,7 +575,8 @@
 void gnome_cmd_bookmark_add_current ()
 {
     GnomeCmdDir *cwd = gnome_cmd_main_win_get_fs (main_win, ACTIVE)->get_directory();
-    gchar *path = gnome_cmd_file_get_path (GNOME_CMD_FILE (cwd));
+    gchar *path = gnome_cmd_dir_is_local (cwd) ? gnome_cmd_file_get_real_path (GNOME_CMD_FILE (cwd)) :
+                                                 gnome_cmd_file_get_path (GNOME_CMD_FILE (cwd));
 
     if (!g_utf8_validate (path, -1, NULL))
     {