debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sqlite history storage truly optional

Browse source
This commit is contained in:
Christian Dywan 2008-10-13 17:50:07 +02:00
parent 36a99b9d22
commit 68cf3388f6
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/main.c
View file

@ -28,7 +28,12 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/tree.h> #include <libxml/tree.h>
#if HAVE_SQLITE3_H
#include <sqlite3.h> #include <sqlite3.h>
#elif HAVE_SQLITE_H
#include <sqlite.h>
#endif
#if ENABLE_NLS #if ENABLE_NLS
#include <libintl.h> #include <libintl.h>
@ -575,6 +580,7 @@ katze_array_from_file (KatzeArray* array,
return TRUE; return TRUE;
} }
#ifdef HAVE_SQLITE
/* Open database 'dbname' */ /* Open database 'dbname' */
static sqlite3* static sqlite3*
db_open (const char* dbname, db_open (const char* dbname,
@ -851,6 +857,7 @@ midori_history_initialize (KatzeArray* array,
} }
return db; return db;
} }
#endif
static gchar* static gchar*
_simple_xml_element (const gchar* name, _simple_xml_element (const gchar* name,
@ -1059,7 +1066,9 @@ main (int argc,
gchar* uri; gchar* uri;
KatzeItem* item; KatzeItem* item;
gchar* uri_ready; gchar* uri_ready;
#ifdef HAVE_SQLITE
sqlite3* db; sqlite3* db;
#endif
#if ENABLE_NLS #if ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR);
@ -1210,8 +1219,11 @@ main (int argc,
g_error_free (error); g_error_free (error);
} }
g_free (config_file); g_free (config_file);
#ifdef HAVE_SQLITE
config_file = g_build_filename (config_path, "history.db", NULL); config_file = g_build_filename (config_path, "history.db", NULL);
#endif
history = katze_array_new (KATZE_TYPE_ARRAY); history = katze_array_new (KATZE_TYPE_ARRAY);
#ifdef HAVE_SQLITE
error = NULL; error = NULL;
if ((db = midori_history_initialize (history, config_file, &error)) == NULL) if ((db = midori_history_initialize (history, config_file, &error)) == NULL)
{ {
@ -1220,6 +1232,7 @@ main (int argc,
g_error_free (error); g_error_free (error);
} }
g_free (config_file); g_free (config_file);
#endif
/* In case of errors */ /* In case of errors */
if (error_messages->len) if (error_messages->len)
@ -1298,10 +1311,12 @@ main (int argc,
g_signal_connect_after (trash, "add-item", g_signal_connect_after (trash, "add-item",
G_CALLBACK (midori_web_list_add_item_cb), NULL); G_CALLBACK (midori_web_list_add_item_cb), NULL);
#ifdef HAVE_SQLITE
g_signal_connect_after (history, "add-item", g_signal_connect_after (history, "add-item",
G_CALLBACK (midori_history_add_item_cb), db); G_CALLBACK (midori_history_add_item_cb), db);
g_signal_connect_after (history, "clear", g_signal_connect_after (history, "clear",
G_CALLBACK (midori_history_clear_cb), db); G_CALLBACK (midori_history_clear_cb), db);
#endif
g_object_set (app, "settings", settings, g_object_set (app, "settings", settings,
"bookmarks", bookmarks, "bookmarks", bookmarks,
@ -1377,7 +1392,9 @@ main (int argc,
NULL); NULL);
g_mkdir_with_parents (config_path, 0755); g_mkdir_with_parents (config_path, 0755);
g_object_unref (history); g_object_unref (history);
#ifdef HAVE_SQLITE
db_close (db); db_close (db);
#endif
config_file = g_build_filename (config_path, "search", NULL); config_file = g_build_filename (config_path, "search", NULL);
error = NULL; error = NULL;
if (!search_engines_save_to_file (search_engines, config_file, &error)) if (!search_engines_save_to_file (search_engines, config_file, &error))

12
wscript
View file

@ -109,9 +109,17 @@ def configure (conf):
print '\t The HTTP backend of GVfs is recommended for' print '\t The HTTP backend of GVfs is recommended for'
print '\t viewing source code and loading favicons.' print '\t viewing source code and loading favicons.'
if not Params.g_options.disable_sqlite:
conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False)
sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1]
if not conf.check_header ('sqlite3.h', 'HAVE_SQLITE3_H'):
conf.check_header ('sqlite.h', 'HAVE_SQLITE_H')
else:
sqlite = 'no'
conf.check_message_custom ('history database', 'support', sqlite)
conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True)
conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False)
conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False)
conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True)
conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True)
@ -146,6 +154,8 @@ def set_options (opt):
help='Disables Unique support', dest='disable_unique') help='Disables Unique support', dest='disable_unique')
opt.add_option ('--disable-gio', action='store_true', default=False, opt.add_option ('--disable-gio', action='store_true', default=False,
help='Disables GIO support', dest='disable_gio') help='Disables GIO support', dest='disable_gio')
opt.add_option ('--disable-sqlite', action='store_true', default=False,
help='Disables sqlite support', dest='disable_sqlite')
opt.add_option ('--enable-update-po', action='store_true', default=False, opt.add_option ('--enable-update-po', action='store_true', default=False,
help='Enables localization file updates', dest='enable_update_po') help='Enables localization file updates', dest='enable_update_po')