Author: benny
Date: 2006-08-09 21:29:55 +0000 (Wed, 09 Aug 2006)
New Revision: 22701
Modified:
terminal/trunk/ChangeLog
terminal/trunk/configure.in.in
terminal/trunk/terminal/terminal-screen.c
Log:
2006-08-09 Benedikt Meurer <[EMAIL PROTECTED]>
* configure.in.in: Post-release version bump.
* terminal/terminal-screen.c(terminal_screen_get_working_directory):
Make sure that we use linprocfs on all systems.
Modified: terminal/trunk/ChangeLog
===================================================================
--- terminal/trunk/ChangeLog 2006-08-09 20:42:50 UTC (rev 22700)
+++ terminal/trunk/ChangeLog 2006-08-09 21:29:55 UTC (rev 22701)
@@ -1,3 +1,9 @@
+2006-08-09 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * configure.in.in: Post-release version bump.
+ * terminal/terminal-screen.c(terminal_screen_get_working_directory):
+ Make sure that we use linprocfs on all systems.
+
2006-07-10 Benedikt Meurer <[EMAIL PROTECTED]>
* === Released 0.2.5.4beta2 ===
Modified: terminal/trunk/configure.in.in
===================================================================
--- terminal/trunk/configure.in.in 2006-08-09 20:42:50 UTC (rev 22700)
+++ terminal/trunk/configure.in.in 2006-08-09 21:29:55 UTC (rev 22701)
@@ -12,9 +12,9 @@
m4_define([terminal_version_major], [0])
m4_define([terminal_version_minor], [2])
m4_define([terminal_version_micro], [5])
-m4_define([terminal_version_nano], [4])
+m4_define([terminal_version_nano], [5])
m4_define([terminal_version_build], [EMAIL PROTECTED]@])
-m4_define([terminal_version_tag], [beta2])
+m4_define([terminal_version_tag], [svn])
m4_define([terminal_version_dbus], [3])
m4_define([terminal_version],
[terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(),
[], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [svn],
[terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])])
Modified: terminal/trunk/terminal/terminal-screen.c
===================================================================
--- terminal/trunk/terminal/terminal-screen.c 2006-08-09 20:42:50 UTC (rev
22700)
+++ terminal/trunk/terminal/terminal-screen.c 2006-08-09 21:29:55 UTC (rev
22701)
@@ -1233,9 +1233,16 @@
if (screen->pid >= 0)
{
+ /* make sure that we use linprocfs on all systems */
+#if defined(__FreeBSD__)
+ file = g_strdup_printf ("/compat/linux/proc/%d/cwd", screen->pid);
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
+ file = g_strdup_printf ("/emul/linux/proc/%d/cwd", screen->pid);
+#else
file = g_strdup_printf ("/proc/%d/cwd", screen->pid);
+#endif
+
length = readlink (file, buffer, sizeof (buffer));
-
if (length > 0 && *buffer == '/')
{
buffer[length] = '\0';
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
