WEBSITE: Add screenshots, fix dependencies. Build instructions.

doc/Build.txt

@@ -10,6 +10,22 @@ sflphoned
 
 Instructions to build `sflphoned`:
 
+
+dbus-c++-bindings
+^^^^^^^^^^^^^^^^^
+
+Go to `libs/dbus` and run:
+
+-------------------------
+./autogen.sh
+./configure --prefix=/usr
+make
+sudo make install
+-------------------------
+
+NOTE: If you have `colorgcc`, configure will fail on `libeXpat`. Issue a `unset CC` and `unset CXX` to build the dbus bindings.
+
+
 libiax2
 ^^^^^^^
 
@@ -44,3 +60,7 @@ sflphone-gtk
 
 Merging of `sflphone-gtk` to come.
 
+-------------------------
+gnome-autogen.sh
+./configure --prefix=/usr
+-------------------------
\ No newline at end of file

doc/Dependencies.txt

@@ -15,6 +15,20 @@ libosip2             2.2.2      http://www.gnu.org/software/osip/[website]
 portaudio            v19        http://www.portaudio.com/[website]
 portaudio C++ binds.            http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz[archive]
 libsamplerate        0.1.2      http://www.mega-nerd.com/SRC/[website]
+dbus-c++-1           0.5        See Build notes.
+libexpat1            1.95.8     Packaged with your favorite distribution
 --------------------------------------------------------------------------------------
 
 
+
+
+Dependencies to compile SFLphone-GTK
+------------------------------------
+
+`--------------------`----------`-----------------------------------------------------
+Program              Version    Notes
+--------------------------------------------------------------------------------------
+libgtk2.0            2.2        
+dbus-glib            0.35       
+--------------------------------------------------------------------------------------
+

doc/Screenshots.txt

@@ -3,9 +3,19 @@
 Screenshots
 -----------
 
-.Screenshot de 2007
-sflimage::images/SflphonePOuetpoUEt.png[SFLphone qt3]
+Upcoming releases
+~~~~~~~~~~~~~~~~~
 
-.Screenshot de SFLphone 0.7
-sflimage::images/sflphone0.7.png[SFLphone 0.7]
+Screenshot of the new SFLphone-GTK client will be here soon.
+
+
+
+Historical
+~~~~~~~~~~
+
+.SFLphone 0.6.2 - Brushed metal skin
+sflimage::images/screenshots/sflphone_qt3_0.6.2.png[SFLphone 0.6.2]
+
+.SFLphone 0.6 - Alternate skin
+sflimage::images/screenshots/sflphone_metal.png[SFLphone 0.6]
 

www/sflphone.funcs.php

@@ -64,7 +64,6 @@ function get_page($page, $compile = TRUE) {
  */
 function show_page($page, $compile = TRUE) {
   print get_page($page, $compile);
-
 }
 
 
@@ -142,7 +141,7 @@ function compile_page($hash, $page) {
   $fnconf = bring_local_file('asciidoc.conf');
 
   // -d book so we can render H1s
-  $p = popen("GIT_DIR=".$GIT_REPOS." git-show $hash | asciidoc -f \"".$fnconf."\"-d book --no-header-footer -", 'r');
+  $p = popen("GIT_DIR=".$GIT_REPOS." git-show $hash | asciidoc -f \"".$fnconf."\" -d book --no-header-footer - 2>&1", 'r');
 
   if (!$p) {
     return "Unable to compile file: $page ($hash)\n";
@@ -203,10 +202,20 @@ function get_git_file_content($file) {
 function get_git_hash_content($hash) {
   global $GIT_REPOS;
 
-  $output = array();
-  $content = exec("GIT_DIR=".$GIT_REPOS." git-show $hash", $output);
+  $output = '';
 
-  return $content;
+  $p = popen("GIT_DIR=".$GIT_REPOS." git-show $hash", 'r');
+
+  if (!$p) {
+    return "Unable to run git-show for hash: $hash\n";
+  }
+
+  while (!feof($p)) {
+    $output .= fread($p, 1024);
+  }
+  pclose($p);
+
+  return $output;
 }
 
 /**