niepce r9 - in trunk: . src/fwk/toolkit src/niepce src/niepce/modules/darkroom src/niepce/ui

From: hub svn gnome org
To: svn-commits-list gnome org
Subject: niepce r9 - in trunk: . src/fwk/toolkit src/niepce src/niepce/modules/darkroom src/niepce/ui
Date: Thu, 29 Jan 2009 01:01:02 +0000 (UTC)
Author: hub
Date: Thu Jan 29 01:01:02 2009
New Revision: 9
URL: http://svn.gnome.org/viewvc/niepce?rev=9&view=rev

Log:
	* README:
	* configure.ac:
	* src/fwk/toolkit/Makefile.am:
	* src/fwk/toolkit/application.cpp:
	* src/fwk/toolkit/configuration.cpp:
	* src/fwk/toolkit/configuration.h:
	* src/niepce/Makefile.am:
	* src/niepce/modules/darkroom/Makefile.am:
	* src/niepce/ui/Makefile.am:
	Remove gconfmm dependency.

Modified:
   trunk/ChangeLog
   trunk/README
   trunk/configure.ac
   trunk/src/fwk/toolkit/Makefile.am
   trunk/src/fwk/toolkit/application.cpp
   trunk/src/fwk/toolkit/configuration.cpp
   trunk/src/fwk/toolkit/configuration.h
   trunk/src/niepce/Makefile.am
   trunk/src/niepce/modules/darkroom/Makefile.am
   trunk/src/niepce/ui/Makefile.am

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Thu Jan 29 01:01:02 2009
@@ -25,7 +25,7 @@
 gtk+ 2.8
 cairo 1.1
 gtkmm 2.10
-gconfmm 2.6 (this will be removed)
+gconf 2.x
 cairomm
 gnome-vfs >= 2.14
 sqlite3
@@ -48,7 +48,7 @@
 Working on Debian
 ~~~~~~~~~~~~~~~~~
 In order to get Niepce working on Debian you should have to install:
-aptitude install libglademm-2.4-dev libgconfmm-2.6-dev libgnomevfs2-dev \
+aptitude install libglademm-2.4-dev gconf2-dev libgnomevfs2-dev \
 > libexempi-dev libopenraw-dev libopenrawgnome-dev libgtkmm-2.4-dev \
 > libgoocanvas-dev
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jan 29 01:01:02 2009
@@ -20,7 +20,8 @@
 dnl if one is harcoded elsewhere, it is a bug
 LIBGTKMM_VERSION=2.10.0
 LIBGLADEMM_VERSION=2.6.0
-LIBGCONFMM_VERSION=2.6.0
+dnl LIBGCONFMM_VERSION=2.6.0
+LIBGCONF_VERSION=2.0.0
 LIBGNOMEUI_VERSION=2.0.0
 LIBGOOCANVASMM_VERSION=0.6.0
 EXEMPI_VERSION=2.0.0
@@ -66,7 +67,8 @@
 PKG_CHECK_MODULES(LIBGTKMM, [gtkmm-2.4 >= $LIBGTKMM_VERSION])
 PKG_CHECK_MODULES(LIBGLADEMM, [libglademm-2.4 >= $LIBGLADEMM_VERSION])
 dnl PKG_CHECK_MODULES(LIBGNOMEUI, [libgnomeui-2.0 >= $LIBGNOMEUI_VERSION])
-PKG_CHECK_MODULES(LIBGCONFMM, [gconfmm-2.6 >= $LIBGCONFMM_VERSION])
+dnl PKG_CHECK_MODULES(LIBGCONFMM, [gconfmm-2.6 >= $LIBGCONFMM_VERSION])
+PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= $LIBGCONF_VERSION])
 PKG_CHECK_MODULES(GNOMEVFS, [gnome-vfs-2.0 >= 2.12])
 PKG_CHECK_EXISTS([gnome-vfs-2.0 >= 2.14], [HAVE_GNOME_VFS_2_14=1], [HAVE_GNOME_VFS_2_14=0])
 dnl AC_SUBST(GNOMEVFS_VER)

Modified: trunk/src/fwk/toolkit/Makefile.am
==============================================================================
--- trunk/src/fwk/toolkit/Makefile.am	(original)
+++ trunk/src/fwk/toolkit/Makefile.am	Thu Jan 29 01:01:02 2009
@@ -3,7 +3,7 @@
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/ext \
 	@LIBGTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ \
-	@LIBGCONFMM_CFLAGS@  @GNOMEVFS_CFLAGS@ @EXEMPI_CFLAGS@ \
+	@GCONF_CFLAGS@  @GNOMEVFS_CFLAGS@ @EXEMPI_CFLAGS@ \
 	$(NULL)
 
 noinst_LIBRARIES = libniepceframework.a

Modified: trunk/src/fwk/toolkit/application.cpp
==============================================================================
--- trunk/src/fwk/toolkit/application.cpp	(original)
+++ trunk/src/fwk/toolkit/application.cpp	Thu Jan 29 01:01:02 2009
@@ -26,6 +26,7 @@
 #include <gtkmm/main.h>
 #include <gtkmm/aboutdialog.h>
 #include <gtkmm/rc.h>
+#include <gconf/gconf.h>
 
 #include "fwk/utils/debug.h"
 #include "application.h"
@@ -108,7 +109,8 @@
 int Application::main(boost::function<Application::Ptr (void)> constructor, 
                       int argc, char **argv)
 {
-    Gnome::Conf::init();
+    // TODO fix error check
+    gconf_init(argc, argv, NULL);
     if(!Glib::thread_supported()) {
         DBG_OUT("thread init");
         Glib::thread_init();

Modified: trunk/src/fwk/toolkit/configuration.cpp
==============================================================================
--- trunk/src/fwk/toolkit/configuration.cpp	(original)
+++ trunk/src/fwk/toolkit/configuration.cpp	Thu Jan 29 01:01:02 2009
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "gconf_proxy_header.h"
+#include <gconf/gconf-client.h>
 
 #include "fwk/utils/debug.h"
 #include "configuration.h"
@@ -29,7 +29,7 @@
 namespace framework {
 
 	Configuration::Configuration(const Glib::ustring & root)
-		: m_gconf(Gnome::Conf::Client::get_default_client()),
+		: m_gconf(gconf_client_get_default()),
 		  m_root(root)
 	{
 	}
@@ -45,14 +45,16 @@
 		//
 		bool found = true;
 
-		try {
-			m_gconf->get(m_root + "/" + key);
-		}
-		catch(Gnome::Conf::Error & err) {
+        GConfValue * v = gconf_client_get(m_gconf,
+                                          Glib::ustring(m_root + "/" + key).c_str(),
+                                          NULL);
+        found = (v != NULL);
+        if(v) {
+            gconf_value_free(v);
+        }
+        else {
 			DBG_OUT("key %s not found", key.c_str());
-			DBG_OUT("exception is %s", err.what().c_str());
-			found = false;
-		}
+        }
 
 		return found;
 	}
@@ -62,13 +64,22 @@
 												const Glib::ustring & def) const
 	{
 		Glib::ustring value;
-		try {
-			value = m_gconf->get_string(m_root + "/" + key);
-		}
-		catch(Gnome::Conf::Error &err) {
-			value = def;
-			DBG_OUT("Exception raised: %s", err.what().c_str());
-		}
+        GError *err = NULL;
+        gchar* v = gconf_client_get_string(m_gconf,
+                                           Glib::ustring(m_root + "/" + key).c_str(),
+                                           &err);
+
+        if(!v) {
+            value = def;
+            if(err) {
+                DBG_OUT("Exception raised: %s", err->message);
+                g_error_free(err);
+            }
+		}
+        else {
+            value = v;
+            g_free(v);
+        }
 
 		return value;
 	}
@@ -76,11 +87,14 @@
 	void Configuration::setValue(const Glib::ustring & key, 
 								 const Glib::ustring & value)
 	{
-		try {
-			m_gconf->set(m_root + "/" + key, value);
-		}
-		catch(Gnome::Conf::Error & err) {
-			DBG_OUT("Exception raised: %s", err.what().c_str());
+        GError *err = NULL;
+        gboolean ret = gconf_client_set_string(m_gconf, 
+                                               Glib::ustring(m_root + "/" + key).c_str(), 
+                                               value.c_str(), &err);
+        
+        if(ret && err) {
+            DBG_OUT("Exception raised: %s", err->message);
+            g_error_free(err);
 		}
 	}
 

Modified: trunk/src/fwk/toolkit/configuration.h
==============================================================================
--- trunk/src/fwk/toolkit/configuration.h	(original)
+++ trunk/src/fwk/toolkit/configuration.h	Thu Jan 29 01:01:02 2009
@@ -21,11 +21,11 @@
 #ifndef _FRAMEWORK_CONFIGURATION_H_
 #define _FRAMEWORK_CONFIGURATION_H_
 
+#include <gconf/gconf-client.h>
+
 #include <glibmm/ustring.h>
 #include <glibmm/refptr.h>
 
-#include "fwk/toolkit/gconf_proxy_header.h"
-
 
 namespace framework {
 
@@ -41,7 +41,7 @@
 
 		void setValue(const Glib::ustring & key, const Glib::ustring & value);
 	private:
-		Glib::RefPtr< Gnome::Conf::Client > m_gconf;
+        GConfClient *                       m_gconf;
 		Glib::ustring                       m_root;
 	};
 

Modified: trunk/src/niepce/Makefile.am
==============================================================================
--- trunk/src/niepce/Makefile.am	(original)
+++ trunk/src/niepce/Makefile.am	Thu Jan 29 01:01:02 2009
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = niepce
 
-niepce_CPPFLAGS = @LIBGTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@	@LIBGCONFMM_CFLAGS@
+niepce_CPPFLAGS = @LIBGTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@	@GCONF_CFLAGS@
 niepce_LDFLAGS = -Wl,--as-needed @BOOST_FILESYSTEM_LDFLAGS@ \
 	@BOOST_THREAD_LDFLAGS@ @BOOST_SIGNALS_LDFLAGS@
 niepce_LDADD = \
@@ -23,7 +23,7 @@
 	$(top_builddir)/src/ncr/libncr.a \
 	$(top_builddir)/src/ext/libgdl/libgdl.a \
 	@LIBGTKMM_LIBS@ @LIBGLADEMM_LIBS@ @SQLITE3_LIBS@ \
-	@GNOMEVFS_LIBS@ @LIBGCONFMM_LIBS@ @BOOST_THREAD_LIBS@ \
+	@GNOMEVFS_LIBS@ @GCONF_LIBS@ @BOOST_THREAD_LIBS@ \
 	@BOOST_FILESYSTEM_LIBS@  @BOOST_SIGNALS_LIBS@ \
 	@GOOCANVASMM_LIBS@ @BABL_LIBS@ \
 	@GEGLMM_LIBS@ @OPENRAW_LIBS@ @EXEMPI_LIBS@

Modified: trunk/src/niepce/modules/darkroom/Makefile.am
==============================================================================
--- trunk/src/niepce/modules/darkroom/Makefile.am	(original)
+++ trunk/src/niepce/modules/darkroom/Makefile.am	Thu Jan 29 01:01:02 2009
@@ -4,7 +4,7 @@
 	-DGLADEDIR=\"$(gladedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	@LIBGTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ \
-	@GNOMEVFS_CFLAGS@ @LIBGCONFMM_CFLAGS@ \
+	@GNOMEVFS_CFLAGS@ @GCONF_CFLAGS@ \
 	@GOOCANVASMM_CFLAGS@  \
 	@GEGLMM_CFLAGS@ @EXEMPI_CFLAGS@ @OPENRAW_CFLAGS@
 

Modified: trunk/src/niepce/ui/Makefile.am
==============================================================================
--- trunk/src/niepce/ui/Makefile.am	(original)
+++ trunk/src/niepce/ui/Makefile.am	Thu Jan 29 01:01:02 2009
@@ -13,7 +13,7 @@
 	-DGLADEDIR=\"$(gladedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	@LIBGTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ \
-	@GNOMEVFS_CFLAGS@ @LIBGCONFMM_CFLAGS@ \
+	@GNOMEVFS_CFLAGS@ @GCONF_CFLAGS@ \
 	@GOOCANVASMM_CFLAGS@ \
 	@EXEMPI_CFLAGS@
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]