bakery r104 - in trunk: . bakery bakery/App bakery/Configuration bakery/Document bakery/Utilities bakery/View

[murrayc svn gnome org]

Author: murrayc
Date: Mon Mar 17 21:30:03 2008
New Revision: 104
URL: http://svn.gnome.org/viewvc/bakery?rev=104&view=rev

Log:
2008-03-17  Murray Cumming  <murrayc murrayc com>

* bakery/App/App_WithDoc.cc:
* bakery/App/App_WithDoc_Gtk.cc:
* bakery/App/GtkDialogs.cc:
* bakery/App/Makefile.am:
* bakery/Configuration/Makefile.am:
* bakery/Document/Document.cc:
* bakery/Document/Makefile.am:
* bakery/Makefile.am:
* bakery/Utilities/Makefile.am:
* bakery/View/Makefile.am:
* bakery/init.cc:
* configure.in: Initial (untested) port from gnome-vfsmm to giomm.

* Makefile.am: 
* bakery-2.4.pc.in: renamed to:
* bakery-2.6.pc.in: 

Added:
   trunk/bakery-2.6.pc.in
      - copied, changed from r102, /trunk/bakery-2.4.pc.in
Removed:
   trunk/bakery-2.4.pc.in
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/bakery/App/App_WithDoc.cc
   trunk/bakery/App/App_WithDoc_Gtk.cc
   trunk/bakery/App/GtkDialogs.cc
   trunk/bakery/App/Makefile.am
   trunk/bakery/Configuration/Makefile.am
   trunk/bakery/Document/Document.cc
   trunk/bakery/Document/Makefile.am
   trunk/bakery/Makefile.am
   trunk/bakery/Utilities/Makefile.am
   trunk/bakery/View/Makefile.am
   trunk/bakery/init.cc
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Mar 17 21:30:03 2008
@@ -3,7 +3,7 @@
 #Build in these directories:
 SUBDIRS= $(GENERIC_LIBRARY_NAME) po docs examples
 
-EXTRA_DIST = bakery-2.4.pc.in autogen.sh \
+EXTRA_DIST = bakery-2.6.pc.in autogen.sh \
              intltool-extract.in intltool-merge.in intltool-update.in
 # (See http://cvs.gnome.org/lxr/source/intltool/README about these intltool files)
 
@@ -11,6 +11,6 @@
 DIST_SUBDIRS = $(GENERIC_LIBRARY_NAME) po docs examples
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = bakery-2.4.pc
+pkgconfig_DATA = bakery-2.6.pc
 
 

Copied: trunk/bakery-2.6.pc.in (from r102, /trunk/bakery-2.4.pc.in)
==============================================================================
--- /trunk/bakery-2.4.pc.in	(original)
+++ trunk/bakery-2.6.pc.in	Mon Mar 17 21:30:03 2008
@@ -5,8 +5,8 @@
 
 Name: bakery
 Description: C++ Application Framework for gnomemm
-Requires: gtkmm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.6.0 gnome-vfsmm-2.6 >= 2.6.0
+Requires: gtkmm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.6.0 giomm-2.16 >= 2.16.0
 Version: @VERSION@
-Libs: -L${libdir} -lbakery-2.4
-Cflags: -I${includedir}/bakery-2.4 -I${libdir}/bakery-2.4/include
+Libs: -L${libdir} -lbakery-2.6
+Cflags: -I${includedir}/bakery-2.6 -I${libdir}/bakery-2.6/include
 

Modified: trunk/bakery/App/App_WithDoc.cc
==============================================================================
--- trunk/bakery/App/App_WithDoc.cc	(original)
+++ trunk/bakery/App/App_WithDoc.cc	Mon Mar 17 21:30:03 2008
@@ -19,7 +19,7 @@
 #include <bakery/App/App_WithDoc.h>
 #include <bakery/App/Dialog_OfferSave.h>
 #include <gconfmm.h>
-#include <libgnomevfsmm.h>
+#include <giomm.h>
 #include <libintl.h>
 #include <algorithm>
 
@@ -229,24 +229,21 @@
 {
   //Check whether file exists already:
   {
-    // Try to open the input file.
-    Gnome::Vfs::Handle read_handle;
+    // Try to examine the input file.
+    Glib::RefPtr<Gio::File> file = Gio::File::create_for_uri(uri);
+
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
-      read_handle.open(uri, Gnome::Vfs::OPEN_READ);
-
-      //It does (there was no exception):
-      return true;
+      return file->query_exists();
     }
-    catch(const Gnome::Vfs::exception& /* ex */)
+    catch(const Gio::Error& /* ex */)
     {
-      return false; //It does not exist.
+      return false; //Something went wrong. It does not exist.
     }
 #else
-      std::auto_ptr<Gnome::Vfs::exception> error;
-      read_handle.open(uri, Gnome::Vfs::OPEN_READ, error);
-      if(error.get() != NULL) return false;
+      std::auto_ptr<Gio::Error> error;
+      retrun file->query_exists(error);
 #endif
   }
 }

Modified: trunk/bakery/App/App_WithDoc_Gtk.cc
==============================================================================
--- trunk/bakery/App/App_WithDoc_Gtk.cc	(original)
+++ trunk/bakery/App/App_WithDoc_Gtk.cc	Mon Mar 17 21:30:03 2008
@@ -20,8 +20,8 @@
 
 #include <bakery/App/App_WithDoc_Gtk.h>
 #include <bakery/App/GtkDialogs.h>
-#include <libgnomevfsmm/utils.h> //For escape_path_string()
-#include <libgnomevfsmm/mime-handlers.h> //For type_is_known(). 
+//#include <libgnomevfsmm/utils.h> //For escape_path_string()
+//#include <libgnomevfsmm/mime-handlers.h> //For type_is_known(). 
 #include <gtkmm/toolbutton.h>
 #include <gtkmm/stock.h>
 #ifdef GTKMM_GEQ_2_10
@@ -103,18 +103,20 @@
       for(type_list_strings::iterator iter = m_mime_types.begin(); iter != m_mime_types.end(); ++iter)
       {
         const Glib::ustring mime_type = *iter;
-#ifndef G_OS_WIN32
-        if( Gnome::Vfs::Mime::type_is_known(mime_type) )
-#endif // !G_OS_WIN32
-        {
+
+        //TODO: Find a gio equivalent for gnome_vfs_mime_type_is_known(). murrayc.
+//#ifndef G_OS_WIN32
+//        if( Gnome::Vfs::Mime::type_is_known(mime_type) )
+//#endif // !G_OS_WIN32
+//        {
           filter.add_mime_type(mime_type);
-        }
-#ifndef G_OS_WIN32
-        else
-        {
-          g_warning("App_WithDoc_Gtk::init_menus_file_recentfiles(): MIME-type %s is not known to gnome-vfs", mime_type.c_str());
-        }
-#endif // !G_OS_WIN32
+//        }
+//#ifndef G_OS_WIN32
+//        else
+//        {
+//          g_warning("App_WithDoc_Gtk::init_menus_file_recentfiles(): MIME-type %s is not known to gnome-vfs", mime_type.c_str());
+//        }
+//#endif // !G_OS_WIN32
       }
 
       Gtk::RecentChooserMenu* menu = Gtk::manage(new Gtk::RecentChooserMenu);

Modified: trunk/bakery/App/GtkDialogs.cc
==============================================================================
--- trunk/bakery/App/GtkDialogs.cc	(original)
+++ trunk/bakery/App/GtkDialogs.cc	Mon Mar 17 21:30:03 2008
@@ -29,7 +29,7 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/filechooserdialog.h>
-#include <libgnomevfsmm.h>
+#include <giomm.h>
 #include <libintl.h>
 
 
@@ -84,24 +84,35 @@
     return Glib::ustring();
 }
 
-static bool uri_is_writable(const Glib::RefPtr<const Gnome::Vfs::Uri>& uri)
+static bool uri_is_writable(const Glib::RefPtr<const Gio::File>& uri)
 {
   if(!uri)
     return false;
 
+  Glib::RefPtr<const Gio::FileInfo> file_info;
+
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  Glib::RefPtr<const Gnome::Vfs::FileInfo> file_info = uri->get_file_info(Gnome::Vfs::FILE_INFO_GET_ACCESS_RIGHTS);
+  try
+  {
+    file_info = uri->query_info(G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
+  }
+  catch(const Glib::Error& /* ex */)
+  {
+    return false;
+  }
 #else
-  std::auto_ptr<Gnome::Vfs::exception> error;
-  Glib::RefPtr<const Gnome::Vfs::FileInfo> file_info = uri->get_file_info(Gnome::Vfs::FILE_INFO_GET_ACCESS_RIGHTS, error);
+  std::auto_ptr<Gio::Error> error;
+  file_info = uri->query_info(G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, Gio::FILE_QUERY_INFO_NONE, error);
+  if(error.get())
+    return false;
 #endif
+
   if(file_info)
   {
-    const Gnome::Vfs::FilePermissions permissions = file_info->get_permissions();
-    return ((permissions & Gnome::Vfs::PERM_ACCESS_WRITABLE) == Gnome::Vfs::PERM_ACCESS_WRITABLE);
+    return file_info->get_attribute_boolean(G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
   }
   else
-    return true; //Not every URI protocol supports FILE_INFO_GET_ACCESS_RIGHTS, so assume that it's writable and complain later.
+    return true; //Not every URI protocol supports access rights, so assume that it's writable and complain later.
 }
 
 Glib::ustring GtkDialogs::ui_file_select_save(App& app, const Glib::ustring& old_file_uri)
@@ -127,11 +138,15 @@
   {
     //Just start with the parent folder,
     //instead of the whole name, to avoid overwriting:
-    Glib::RefPtr<Gnome::Vfs::Uri> vfs_uri = Gnome::Vfs::Uri::create(old_file_uri);
-    if(vfs_uri)
+    Glib::RefPtr<Gio::File> gio_file = Gio::File::create_for_uri(old_file_uri);
+    if(gio_file)
     {
-      Glib::ustring uri_parent = vfs_uri->extract_dirname();
-      fileChooser_Save.set_uri(uri_parent);
+      Glib::RefPtr<Gio::File> parent = gio_file->get_parent();
+      if(parent)
+      {
+        const Glib::ustring uri_parent = parent->get_uri();
+        fileChooser_Save.set_uri(uri_parent);
+      }
     }
   }
 
@@ -160,16 +175,14 @@
     {
       const Glib::ustring uri = fileChooser_Save.get_uri();
 
-      Glib::RefPtr<Gnome::Vfs::Uri> vfs_uri = Gnome::Vfs::Uri::create(uri);
-      if(!vfs_uri)
-        return Glib::ustring(); //Failure.
+      Glib::RefPtr<Gio::File> gio_file = Gio::File::create_for_uri(uri);
 
       //If the file exists (the FileChooser offers a "replace?" dialog, so this is possible.):
       if(App_WithDoc::file_exists(uri))
       {
         //Check whether we have rights to the file to change it:
         //Really, GtkFileChooser should do this for us.
-        if(!uri_is_writable(vfs_uri))
+        if(!uri_is_writable(gio_file))
         {
            //Warn the user:
            ui_warning(app, gettext("Read-only File."), gettext("You may not overwrite the existing file, because you do not have sufficient access rights."));
@@ -180,10 +193,10 @@
 
       //Check whether we have rights to the directory, to create a new file in it:
       //Really, GtkFileChooser should do this for us.
-      Glib::RefPtr<const Gnome::Vfs::Uri> vfs_uri_parent = vfs_uri->get_parent();
-      if(vfs_uri_parent)
+      Glib::RefPtr<const Gio::File> gio_file_parent = gio_file->get_parent();
+      if(gio_file_parent)
       {
-        if(!uri_is_writable(vfs_uri_parent))
+        if(!uri_is_writable(gio_file_parent))
         {
           //Warn the user:
            ui_warning(app, gettext("Read-only Directory."), gettext("You may not create a file in this directory, because you do not have sufficient access rights."));

Modified: trunk/bakery/App/Makefile.am
==============================================================================
--- trunk/bakery/App/Makefile.am	(original)
+++ trunk/bakery/App/Makefile.am	Mon Mar 17 21:30:03 2008
@@ -4,7 +4,7 @@
 
 cc_sources = App.cc App_WithDoc.cc App_Gtk.cc GtkDialogs.cc App_WithDoc_Gtk.cc AppInstanceManager.cc Dialog_OfferSave.cc
 
-library_includedir=$(includedir)/bakery-2.4/$(GENERIC_LIBRARY_NAME)/App
+library_includedir=$(includedir)/bakery-2.6/$(GENERIC_LIBRARY_NAME)/App
 library_include_HEADERS = $(h_sources)
 
 INCLUDES = -I top_srcdir@/ $(BAKERY_CFLAGS)

Modified: trunk/bakery/Configuration/Makefile.am
==============================================================================
--- trunk/bakery/Configuration/Makefile.am	(original)
+++ trunk/bakery/Configuration/Makefile.am	Mon Mar 17 21:30:03 2008
@@ -1,7 +1,7 @@
 h_sources = Association.h AssociationBase.h Client.h Dialog_Preferences.h
 cc_sources = Association.cc AssociationBase.cc Client.cc Dialog_Preferences.cc
 
-library_includedir=$(includedir)/bakery-2.4/$(GENERIC_LIBRARY_NAME)/Configuration
+library_includedir=$(includedir)/bakery-2.6/$(GENERIC_LIBRARY_NAME)/Configuration
 library_include_HEADERS = $(h_sources)
 
 INCLUDES = -I top_srcdir@/ $(BAKERY_CFLAGS)

Modified: trunk/bakery/Document/Document.cc
==============================================================================
--- trunk/bakery/Document/Document.cc	(original)
+++ trunk/bakery/Document/Document.cc	Mon Mar 17 21:30:03 2008
@@ -17,7 +17,7 @@
  */
 
 #include "bakery/Document/Document.h"
-#include <libgnomevfsmm.h>
+#include <giomm.h>
 //#include <fstream>
 #include <libintl.h>
 
@@ -190,29 +190,30 @@
 {
   m_strContents.erase();
 
-  // open the input file for read access
-  Gnome::Vfs::Handle read_handle;
+  // Open the input file for read access:
+  Glib::RefPtr<Gio::File> file = Gio::File::create_for_uri(m_file_uri);
+  Glib::RefPtr<Gio::FileInputStream> stream;
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    read_handle.open(m_file_uri, Gnome::Vfs::OPEN_READ);
+    stream = file->read();
   }
-  catch(const Gnome::Vfs::exception& ex)
+  catch(const Gio::Error& ex)
   {
     // If the operation was not successful, print the error and abort
     return false; //print_error(ex, input_uri_string);
   }
 #else
-  std::auto_ptr<Gnome::Vfs::exception> error;
-  read_handle.open(m_file_uri, Gnome::Vfs::OPEN_READ, error);
+  std::auto_ptr<Gio::Error> error;
+  Glib::RefPtr<FileInputStream> stream = file.read(error);
   if(error.get() != NULL)
     return false; //print_error(ex, input_uri_string);
 #endif
 
   // Read data from the input uri:
   guint buffer[BYTES_TO_PROCESS] = {0, }; // For each chunk.
-  Gnome::Vfs::FileSize bytes_read = 0;
+  gsize bytes_read = 0;
   std::string data; //We use a std::string because we might not get whole UTF8 characters at a time. This might not be necessary.
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -223,9 +224,9 @@
     while(bContinue)
     {
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-      bytes_read = read_handle.read(buffer, BYTES_TO_PROCESS);
+      bytes_read = stream->read(buffer, BYTES_TO_PROCESS);
 #else
-      bytes_read = read_handle.read(buffer, BYTES_TO_PROCESS, error);
+      bytes_read = stream->read(buffer, BYTES_TO_PROCESS, error);
       if(error.get() != NULL) break;
 #endif
 
@@ -239,12 +240,12 @@
     }
   }
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  catch(const Gnome::Vfs::exception& ex)
+  catch(const Gio::Error& ex)
   {
 #else
   if(error.get() != NULL)
   {
-    Gnome::Vfs::exception& ex = *error.get();
+    Gio::Error& ex = *error.get();
 #endif
     // If the operation was not successful, print the error and abort
     return false; //print_error(ex, input_uri_string);
@@ -262,45 +263,55 @@
   //Write the changed data to disk:
   if(get_modified())
   {
-    /* we use create instead of open, because open will not create the file if it does
-    not already exist. The last argument is the permissions to use if the file is created,
-    the second to last tells GnomeVFS that its ok if the file already exists, and just open it */
-
-    Gnome::Vfs::Handle write_handle;
+    Glib::RefPtr<Gio::File> file = Gio::File::create_for_uri(m_file_uri);
+    Glib::RefPtr<Gio::FileOutputStream> stream;
 
+    //Create the file if it does not already exist:
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
-      //0660 means "this user and his group can read and write this non-executable file".
-      //The 0 prefix means that this is octal.
-      write_handle.create(m_file_uri, Gnome::Vfs::OPEN_WRITE, false, 0660 /* leading zero means octal */);
+      if(file->query_exists())
+      {
+        stream = file->replace(); //Instead of append_to().
+      }
+      else
+      {
+        //By default files created are generally readable by everyone, but if we pass FILE_CREATE_PRIVATE in flags the file will be made readable only to the current user, to the level that is supported on the target filesystem.
+        //TODO: Do we eant to specify 0660 exacltly? (means "this user and his group can read and write this non-executable file".)
+        stream = file->create_file();
+      }
     }
-    catch(const Gnome::Vfs::exception& ex)
+    catch(const Gio::Error& ex)
     {
 #else
-    std::auto_ptr<Gnome::Vfs::exception> error;
-    write_handle.create(m_file_uri, Gnome::Vfs::OPEN_WRITE, false, 0660 /* loading zero means octal */, error);
+    std::auto_ptr<Gio::Error> error;
+    stream.create(error);
     if(error.get() != NULL)
     {
-      const Gnome::Vfs::exception& ex = *error.get();
+      const Gio::Error& ex = *error.get();
 #endif
      // If the operation was not successful, print the error and abort
      return false; // print_error(ex, output_uri_string);
     }
 
+
+    if(!stream)
+      return false;
+
+
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
       //Write the data to the output uri
-      GnomeVFSFileSize bytes_written = write_handle.write(m_strContents.data(), m_strContents.bytes());
+      const gsize bytes_written = stream->write(m_strContents.data(), m_strContents.bytes());
     }
-    catch(const Gnome::Vfs::exception& ex)
+    catch(const Gio::Error& ex)
     {
 #else
-    GnomeVFSFileSize bytes_written = write_handle.write(m_strContents.data(), m_strContents.bytes(), error);
+    const gsize bytes_written = stream->write(m_strContents.data(), m_strContents.bytes(), error);
     if(error.get() != NULL)
     {
-      Gnome::Vfs::exception& ex = *error.get();
+      Gio::Error& ex = *error.get();
 #endif
       // If the operation was not successful, print the error and abort
       return false; //print_error(ex, output_uri_string);
@@ -359,7 +370,7 @@
 {
   if(m_bReadOnly)
   {
-    //An application might have use set_read_only() to make this document explicitly read_only, regardless of the positions of the storage location.
+    //An application might have used set_read_only() to make this document explicitly read_only, regardless of the positions of the storage location.
     return true;
   }
   else
@@ -368,24 +379,25 @@
       return false; //It must be a default empty document, not yet saved, so it is not read-only.
     else
     {
-      Glib::RefPtr<Gnome::Vfs::FileInfo> info;
+      Glib::RefPtr<Gio::File> file = Gio::File::create_for_uri(m_file_uri);
+      Glib::RefPtr<Gio::FileInfo> info;
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
       try
       {
-        info = Gnome::Vfs::Handle::get_file_info(m_file_uri, Gnome::Vfs::FILE_INFO_GET_ACCESS_RIGHTS);
+        Glib::RefPtr<Gio::FileInfo> info = file->query_info(G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
       }
-      catch(const Gnome::Vfs::exception& ex)
+      catch(const Gio::Error& ex)
       {
         return false; //We should at least be able to read the permissions, so maybe the location is invalid. I'm not sure what the best return result here is.
       }
 #else
-      std::auto_ptr<Gnome::Vfs::exception> error;
-      info = Gnome::Vfs::Handle::get_file_info(m_file_uri, Gnome::Vfs::FILE_INFO_GET_ACCESS_RIGHTS, error);
-      if(error.get() != NULL) return false;
+      std::auto_ptr<Gio::Error> error;
+      Glib::RefPtr<Gio::FileInfo> info = file.query_info(G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, Gio::FILE_QUERY_INFO_NONE, error);
+      if(error.get() != NULL)
+        return false;
 #endif
 
-      Gnome::Vfs::FilePermissions permissions = info->get_permissions();
-      const bool read_only = ((permissions & Gnome::Vfs::PERM_ACCESS_WRITABLE) != Gnome::Vfs::PERM_ACCESS_WRITABLE);
+      const bool read_only = info->get_attribute_boolean(G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
       return read_only;
     }
   }

Modified: trunk/bakery/Document/Makefile.am
==============================================================================
--- trunk/bakery/Document/Makefile.am	(original)
+++ trunk/bakery/Document/Makefile.am	Mon Mar 17 21:30:03 2008
@@ -1,7 +1,7 @@
 h_sources = Document.h Document_XML.h
 cc_sources = Document.cc Document_XML.cc
 
-library_includedir=$(includedir)/bakery-2.4/$(GENERIC_LIBRARY_NAME)/Document
+library_includedir=$(includedir)/bakery-2.6/$(GENERIC_LIBRARY_NAME)/Document
 library_include_HEADERS = $(h_sources)
 
 INCLUDES = -I top_srcdir@/ $(BAKERY_CFLAGS)

Modified: trunk/bakery/Makefile.am
==============================================================================
--- trunk/bakery/Makefile.am	(original)
+++ trunk/bakery/Makefile.am	Mon Mar 17 21:30:03 2008
@@ -3,7 +3,7 @@
 h_sources = bakery.h init.h
 cc_sources = init.cc
 
-library_includedir=$(includedir)/bakery-2.4/$(GENERIC_LIBRARY_NAME)
+library_includedir=$(includedir)/bakery-2.6/$(GENERIC_LIBRARY_NAME)
 library_include_HEADERS = $(h_sources)
 
 INCLUDES = -I$(top_srcdir) $(BAKERY_CFLAGS)
@@ -14,17 +14,17 @@
 no_undefined =
 endif
 
-lib_LTLIBRARIES = libbakery-2.4.la
-libbakery_2_4_la_SOURCES = $(h_sources) $(cc_sources)
-libbakery_2_4_la_LIBADD = App/libbakery_app.la \
+lib_LTLIBRARIES = libbakery-2.6.la
+libbakery_2_6_la_SOURCES = $(h_sources) $(cc_sources)
+libbakery_2_6_la_LIBADD = App/libbakery_app.la \
                       Configuration/libbakery_configuration.la \
                       Document/libbakery_document.la \
                       Utilities/libbakery_utilities.la \
                       View/libbakery_view.la \
                       $(BAKERY_LIBS)
-libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE) -no-undefined
+libbakery_2_6_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE) -no-undefined
 
 # Install the headers:
-library_configdir = $(libdir)/bakery-2.4/include
+library_configdir = $(libdir)/bakery-2.6/include
 library_config_DATA = bakeryconfig.h
 

Modified: trunk/bakery/Utilities/Makefile.am
==============================================================================
--- trunk/bakery/Utilities/Makefile.am	(original)
+++ trunk/bakery/Utilities/Makefile.am	Mon Mar 17 21:30:03 2008
@@ -1,7 +1,7 @@
 h_sources = BusyCursor.h sharedptr.h
 cc_sources = BusyCursor.cc
 
-library_includedir=$(includedir)/bakery-2.4/$(GENERIC_LIBRARY_NAME)/Utilities
+library_includedir=$(includedir)/bakery-2.6/$(GENERIC_LIBRARY_NAME)/Utilities
 library_include_HEADERS = $(h_sources)
 
 INCLUDES = -I top_srcdir@/ $(BAKERY_CFLAGS)

Modified: trunk/bakery/View/Makefile.am
==============================================================================
--- trunk/bakery/View/Makefile.am	(original)
+++ trunk/bakery/View/Makefile.am	Mon Mar 17 21:30:03 2008
@@ -1,7 +1,7 @@
 h_sources = View.h ViewBase.h View_Composite.h 
 cc_sources = View.cc ViewBase.cc View_Composite.cc 
 
-library_includedir=$(includedir)/bakery-2.4/$(GENERIC_LIBRARY_NAME)/View
+library_includedir=$(includedir)/bakery-2.6/$(GENERIC_LIBRARY_NAME)/View
 library_include_HEADERS = $(h_sources)
 
 INCLUDES = -I top_srcdir@/ $(BAKERY_CFLAGS)

Modified: trunk/bakery/init.cc
==============================================================================
--- trunk/bakery/init.cc	(original)
+++ trunk/bakery/init.cc	Mon Mar 17 21:30:03 2008
@@ -18,7 +18,6 @@
  
 #include <bakery/init.h>
 #include <gconfmm.h>
-#include <libgnomevfsmm.h>
 #include <libglademm.h>
 
 namespace Bakery
@@ -28,7 +27,6 @@
 {
   Gnome::Conf::init();
   //Gnome::Glade::init();
-  Gnome::Vfs::init();
 }
 
 } //namespace

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar 17 21:30:03 2008
@@ -97,7 +97,7 @@
 dnl Checks for libraries:
 dnl -----------------------------------------------
 
-REQUIRED_LIBRARIES="gtkmm-2.4 >= 2.10.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.8.0 gnome-vfsmm-2.6 >= 2.6.0"
+REQUIRED_LIBRARIES="gtkmm-2.4 >= 2.10.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.8.0 giomm-2.4 >= 2.16.0"
 
 AC_ARG_ENABLE([maemo],
 	AC_HELP_STRING([--enable-maemo],
@@ -141,7 +141,7 @@
 dnl -----------------------------------------------
 
 AC_OUTPUT(Makefile 
-          bakery-2.4.pc 
+          bakery-2.6.pc 
           bakery/Makefile 
           bakery/App/Makefile
           bakery/Configuration/Makefile