[epiphany/history-rewrite: 8/26] Move all SQLite and history service files to lib and remove CVS Id's.

[Claudio Saavedra <csaavedra src gnome org>]

commit c2c0494f8a0d9bdafcf366f072effb834ccd15e3
Author: Martin Robinson <mrobinson igalia com>
Date:   Fri May 13 15:03:14 2011 -0700

    Move all SQLite and history service files to lib and remove CVS Id's.

 embed/Makefile.am                                 |    6 -
 embed/history/ephy-history-service-private.h      |   46 --
 embed/history/ephy-history-service-urls-table.c   |  191 --------
 embed/history/ephy-history-service-visits-table.c |  144 ------
 embed/history/ephy-history-service.c              |  505 ---------------------
 embed/history/ephy-history-service.h              |   64 ---
 embed/history/ephy-history-types.c                |  131 ------
 embed/history/ephy-history-types.h                |   83 ----
 embed/sqlite/ephy-sqlite-transaction.c            |   70 ---
 embed/sqlite/ephy-sqlite-transaction.h            |   56 ---
 lib/Makefile.am                                   |    6 +
 {embed => lib}/sqlite/ephy-sqlite-connection.c    |   14 +-
 {embed => lib}/sqlite/ephy-sqlite-connection.h    |    2 -
 {embed => lib}/sqlite/ephy-sqlite-statement.c     |   14 +-
 {embed => lib}/sqlite/ephy-sqlite-statement.h     |    2 -
 {embed => lib}/sqlite/ephy-sqlite.h               |    2 -
 tests/Makefile.am                                 |    4 +-
 17 files changed, 20 insertions(+), 1320 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 45ccf3f..d517fb4 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -49,12 +49,6 @@ libephyembed_la_SOURCES = \
 	ephy-permission-manager.c	\
 	ephy-embed-prefs.c		\
 	ephy-web-view.c			\
-	history/ephy-history-service.c	\
-	history/ephy-history-service-urls-table.c	\
-	history/ephy-history-service-visits-table.c	\
-	history/ephy-history-types.c	\
-	sqlite/ephy-sqlite-connection.c	\
-	sqlite/ephy-sqlite-statement.c	\
 	$(INST_H_FILES)			\
 	$(NOINST_H_FILES)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3b4172d..1f7af25 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -73,6 +73,12 @@ libephymisc_la_SOURCES = \
 	ephy-stock-icons.c			\
 	ephy-time-helpers.c			\
 	ephy-zoom.c				\
+	history/ephy-history-service.c	\
+	history/ephy-history-service-urls-table.c	\
+	history/ephy-history-service-visits-table.c	\
+	history/ephy-history-types.c	\
+	sqlite/ephy-sqlite-connection.c	\
+	sqlite/ephy-sqlite-statement.c	\
 	$(INST_H_FILES)				\
 	$(NOINST_H_FILES)
 
diff --git a/embed/sqlite/ephy-sqlite-connection.c b/lib/sqlite/ephy-sqlite-connection.c
similarity index 96%
rename from embed/sqlite/ephy-sqlite-connection.c
rename to lib/sqlite/ephy-sqlite-connection.c
index a3bcdc7..87ced83 100644
--- a/embed/sqlite/ephy-sqlite-connection.c
+++ b/lib/sqlite/ephy-sqlite-connection.c
@@ -14,8 +14,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *  $Id$
  */
 
 #include "config.h"
@@ -33,7 +31,7 @@ enum {
 };
 
 struct _EphySQLiteConnectionPrivate {
-  sqlite3* database;
+  sqlite3 *database;
 };
 
 #define EPHY_SQLITE_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), EPHY_TYPE_SQLITE_CONNECTION, EphySQLiteConnectionPrivate))
@@ -62,7 +60,7 @@ ephy_sqlite_connection_finalize (GObject *self)
   G_OBJECT_CLASS (ephy_sqlite_connection_parent_class)->dispose (self);
 }
 
-static GQuark get_ephy_sqlite_quark (void)
+static GQuark get_ephy_sqlite_quark ()
 {
   return g_quark_from_static_string ("ephy-sqlite");
 }
@@ -75,7 +73,7 @@ set_error_from_string (const char* string, GError **error)
 }
 
 EphySQLiteConnection *
-ephy_sqlite_connection_new (void)
+ephy_sqlite_connection_new ()
 {
   return EPHY_SQLITE_CONNECTION (g_object_new (EPHY_TYPE_SQLITE_CONNECTION, NULL));
 }
@@ -90,7 +88,7 @@ ephy_sqlite_connection_open (EphySQLiteConnection *self, const gchar *filename,
     return FALSE;
   }
   
-  if (SQLITE_OK != sqlite3_open (filename, &priv->database)) {
+  if (sqlite3_open (filename, &priv->database) != SQLITE_OK) {
     ephy_sqlite_connection_get_error (self, error);
     priv->database = NULL;
     return FALSE;
@@ -121,7 +119,7 @@ ephy_sqlite_connection_execute (EphySQLiteConnection *self, const char *sql, GEr
 {
   EphySQLiteConnectionPrivate *priv = self->priv;
   
-  if (!priv->database) {
+  if (priv->database == NULL) {
     set_error_from_string ("Connection not open.", error);
     return FALSE;
   }
@@ -135,7 +133,7 @@ ephy_sqlite_connection_create_statement (EphySQLiteConnection *self, const char
   EphySQLiteConnectionPrivate *priv = self->priv;
   sqlite3_stmt *prepared_statement;
 
-  if (!priv->database) {
+  if (priv->database == NULL) {
     set_error_from_string ("Connection not open.", error);
     return NULL;
   }
diff --git a/embed/sqlite/ephy-sqlite-connection.h b/lib/sqlite/ephy-sqlite-connection.h
similarity index 99%
rename from embed/sqlite/ephy-sqlite-connection.h
rename to lib/sqlite/ephy-sqlite-connection.h
index 9f3f691..6383870 100644
--- a/embed/sqlite/ephy-sqlite-connection.h
+++ b/lib/sqlite/ephy-sqlite-connection.h
@@ -14,8 +14,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *  $Id$
  */
 
 #ifndef EPHY_SQLITE_CONNECTION_H
diff --git a/embed/sqlite/ephy-sqlite-statement.c b/lib/sqlite/ephy-sqlite-statement.c
similarity index 93%
rename from embed/sqlite/ephy-sqlite-statement.c
rename to lib/sqlite/ephy-sqlite-statement.c
index 36ac76e..ec4c6b9 100644
--- a/embed/sqlite/ephy-sqlite-statement.c
+++ b/lib/sqlite/ephy-sqlite-statement.c
@@ -14,8 +14,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *  $Id$
  */
 
 #include "config.h"
@@ -138,7 +136,7 @@ ephy_sqlite_statement_finalize (GObject *self)
 gboolean
 ephy_sqlite_statement_bind_null (EphySQLiteStatement *self, int column, GError **error)
 {
-  if (SQLITE_OK != sqlite3_bind_null (self->priv->prepared_statement, column)) {
+  if (sqlite3_bind_null (self->priv->prepared_statement, column) != SQLITE_OK) {
     ephy_sqlite_connection_get_error (self->priv->connection, error);
     return FALSE;
   }
@@ -148,7 +146,7 @@ ephy_sqlite_statement_bind_null (EphySQLiteStatement *self, int column, GError *
 gboolean
 ephy_sqlite_statement_bind_boolean (EphySQLiteStatement *self, int column, gboolean value, GError **error)
 {
-  if (SQLITE_OK != sqlite3_bind_int (self->priv->prepared_statement, column + 1, value ? 1 : 0)) {
+  if (sqlite3_bind_int (self->priv->prepared_statement, column + 1, value ? 1 : 0) != SQLITE_OK) {
     ephy_sqlite_connection_get_error (self->priv->connection, error);
     return FALSE;
   }
@@ -158,7 +156,7 @@ ephy_sqlite_statement_bind_boolean (EphySQLiteStatement *self, int column, gbool
 gboolean
 ephy_sqlite_statement_bind_int (EphySQLiteStatement *self, int column, int value, GError **error)
 {
-  if (SQLITE_OK != sqlite3_bind_int (self->priv->prepared_statement, column + 1, value)) {
+  if (sqlite3_bind_int (self->priv->prepared_statement, column + 1, value) != SQLITE_OK) {
     ephy_sqlite_connection_get_error (self->priv->connection, error);
     return FALSE;
   }
@@ -168,7 +166,7 @@ ephy_sqlite_statement_bind_int (EphySQLiteStatement *self, int column, int value
 gboolean
 ephy_sqlite_statement_bind_double (EphySQLiteStatement *self, int column, double value, GError **error)
 {
-  if (SQLITE_OK != sqlite3_bind_double (self->priv->prepared_statement, column + 1, value)) {
+  if (sqlite3_bind_double (self->priv->prepared_statement, column + 1, value) != SQLITE_OK) {
     ephy_sqlite_connection_get_error (self->priv->connection, error);
     return FALSE;
   }
@@ -178,7 +176,7 @@ ephy_sqlite_statement_bind_double (EphySQLiteStatement *self, int column, double
 gboolean
 ephy_sqlite_statement_bind_string (EphySQLiteStatement *self, int column, const char *value, GError **error)
 {
-  if (SQLITE_OK != sqlite3_bind_text (self->priv->prepared_statement, column + 1, value, -1, SQLITE_TRANSIENT)) {
+  if (sqlite3_bind_text (self->priv->prepared_statement, column + 1, value, -1, SQLITE_TRANSIENT) != SQLITE_OK) {
     ephy_sqlite_connection_get_error (self->priv->connection, error);
     return FALSE;
   }
@@ -188,7 +186,7 @@ ephy_sqlite_statement_bind_string (EphySQLiteStatement *self, int column, const
 gboolean
 ephy_sqlite_statement_bind_blob (EphySQLiteStatement *self, int column, const void *value, int length, GError **error)
 {
-  if (SQLITE_OK != sqlite3_bind_blob (self->priv->prepared_statement, column + 1, value, length, SQLITE_TRANSIENT)) {
+  if (sqlite3_bind_blob (self->priv->prepared_statement, column + 1, value, length, SQLITE_TRANSIENT) != SQLITE_OK) {
     ephy_sqlite_connection_get_error (self->priv->connection, error);
     return FALSE;
   }
diff --git a/embed/sqlite/ephy-sqlite-statement.h b/lib/sqlite/ephy-sqlite-statement.h
similarity index 99%
rename from embed/sqlite/ephy-sqlite-statement.h
rename to lib/sqlite/ephy-sqlite-statement.h
index 98ea132..c88947f 100644
--- a/embed/sqlite/ephy-sqlite-statement.h
+++ b/lib/sqlite/ephy-sqlite-statement.h
@@ -14,8 +14,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *  $Id$
  */
 
 #ifndef EPHY_SQLITE_STATEMENT_H
diff --git a/embed/sqlite/ephy-sqlite.h b/lib/sqlite/ephy-sqlite.h
similarity index 98%
rename from embed/sqlite/ephy-sqlite.h
rename to lib/sqlite/ephy-sqlite.h
index a73794d..dc151ec 100644
--- a/embed/sqlite/ephy-sqlite.h
+++ b/lib/sqlite/ephy-sqlite.h
@@ -14,8 +14,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *  $Id$
  */
 
 #ifndef EPHY_SQLITE_H
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c97d40e..304ff0a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,9 +9,9 @@ noinst_PROGRAMS = \
 
 INCLUDES = \
 	-I$(top_srcdir)/embed    \
-	-I$(top_srcdir)/embed/sqlite \
-	-I$(top_srcdir)/embed/history \
 	-I$(top_srcdir)/lib      \
+	-I$(top_srcdir)/lib/history \
+	-I$(top_srcdir)/lib/sqlite \
 	-I$(top_srcdir)/lib/widgets \
 	-I$(top_srcdir)/src      \
 	-I$(top_srcdir)/src/bookmarks