SF.net SVN: geany:[3532] trunk

[eht16 at users.sourceforge.net]

Revision: 3532
          http://geany.svn.sourceforge.net/geany/?rev=3532&view=rev
Author:   eht16
Date:     2009-02-01 18:03:19 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Use the document's real path when the VTE setting 'Follow the path of the current file' is used to prevent unnecessary directory changes when symlinks are used (reported by Dominic Hopf).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/document.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-01-30 18:53:23 UTC (rev 3531)
+++ trunk/ChangeLog	2009-02-01 18:03:19 UTC (rev 3532)
@@ -1,3 +1,11 @@
+2009-02-01  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/callbacks.c, src/document.c:
+   Use the document's real path when the VTE setting 'Follow the path of
+   the current file' is used to prevent unnecessary directory changes
+   when symlinks are used (reported by Dominic Hopf).
+
+
 2009-01-30  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/plugins.c, src/plugindata.h, src/utils.c, plugins/filebrowser.c,

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2009-01-30 18:53:23 UTC (rev 3531)
+++ trunk/src/callbacks.c	2009-02-01 18:03:19 UTC (rev 3532)
@@ -730,7 +730,7 @@
 		document_check_disk_status(doc, FALSE);
 
 #ifdef HAVE_VTE
-		vte_cwd(DOC_FILENAME(doc), FALSE);
+		vte_cwd((doc->real_path != NULL) ? doc->real_path : doc->file_name, FALSE);
 #endif
 
 		g_signal_emit_by_name(geany_object, "document-activate", doc);

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2009-01-30 18:53:23 UTC (rev 3531)
+++ trunk/src/document.c	2009-02-01 18:03:19 UTC (rev 3532)
@@ -1790,7 +1790,7 @@
 		msgwin_status_add(_("File %s saved."), doc->file_name);
 		ui_update_statusbar(doc, -1);
 #ifdef HAVE_VTE
-		vte_cwd(doc->file_name, FALSE);
+		vte_cwd((doc->real_path != NULL) ? doc->real_path : doc->file_name, FALSE);
 #endif
 	}
 	g_free(locale_filename);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.