bakery r105 - in trunk: . bakery bakery/Document docs/reference examples

[murrayc svn gnome org]

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

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

* bakery/Document/Document.cc: get_read_only(): Fix a crash caused by 
a redeclaration of a variable.
* bakery/init.cc: init(): Initialize giomm.
* examples/Makefile.am_fragment: Link to the bakery-2.6 library 
instead of 2.4, to fix the build.

Modified:
   trunk/ChangeLog
   trunk/bakery/Document/Document.cc
   trunk/bakery/init.cc
   trunk/docs/reference/Doxyfile
   trunk/examples/Makefile.am_fragment

Modified: trunk/bakery/Document/Document.cc
==============================================================================
--- trunk/bakery/Document/Document.cc	(original)
+++ trunk/bakery/Document/Document.cc	Mon Mar 17 21:59:59 2008
@@ -392,11 +392,14 @@
       }
 #else
       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);
+      info = file.query_info(G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, Gio::FILE_QUERY_INFO_NONE, error);
       if(error.get() != NULL)
         return false;
 #endif
 
+      if(!info)
+        return false;
+
       const bool read_only = info->get_attribute_boolean(G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
       return read_only;
     }

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

Modified: trunk/docs/reference/Doxyfile
==============================================================================
--- trunk/docs/reference/Doxyfile	(original)
+++ trunk/docs/reference/Doxyfile	Mon Mar 17 21:59:59 2008
@@ -4,7 +4,7 @@
 # General configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = bakery
-PROJECT_NUMBER         = 1.1
+PROJECT_NUMBER         = 2.6
 OUTPUT_DIRECTORY       = 
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO

Modified: trunk/examples/Makefile.am_fragment
==============================================================================
--- trunk/examples/Makefile.am_fragment	(original)
+++ trunk/examples/Makefile.am_fragment	Mon Mar 17 21:59:59 2008
@@ -2,4 +2,4 @@
 INCLUDES =  -I$(top_srcdir) $(BAKERY_CFLAGS)
 
 #The libraries that the executable needs to link against:
-LIBS = $(top_builddir)/bakery/libbakery-2.4.la @LIBS@ @BAKERY_LIBS@
+LIBS = $(top_builddir)/bakery/libbakery-2.6.la @LIBS@ @BAKERY_LIBS@