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

Make libxml technically optional, while it remains mandatory

Browse source
This commit is contained in:
Christian Dywan 2008-11-18 22:26:06 +01:00
parent 166a7e48e0
commit 79cbcd0886
1 changed files with 15 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
midori/main.c
View file

@ -27,8 +27,11 @@
#include <string.h> #include <string.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libxml/parser.h>
#include <libxml/tree.h> #ifdef HAVE_LIBXML
#include <libxml/parser.h>
#include <libxml/tree.h>
#endif
#ifdef HAVE_SQLITE #ifdef HAVE_SQLITE
#include <sqlite3.h> #include <sqlite3.h>
@ -364,6 +367,7 @@ midori_web_list_add_item_cb (KatzeArray* trash,
} }
} }
#ifdef HAVE_LIBXML
static KatzeItem* static KatzeItem*
katze_item_from_xmlNodePtr (xmlNodePtr cur) katze_item_from_xmlNodePtr (xmlNodePtr cur)
{ {
@ -503,39 +507,6 @@ katze_array_from_xmlDocPtr (KatzeArray* array,
return TRUE; return TRUE;
} }
#if 0
static gboolean
katze_array_from_data (KatzeArray* array,
const gchar* data,
GError** error)
{
xmlDocPtr doc;
g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE);
g_return_val_if_fail (data != NULL, FALSE);
katze_array_clear (array);
if((doc = xmlParseMemory (data, strlen (data))) == NULL)
{
/* No valid xml or broken encoding */
*error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Malformed document."));
return FALSE;
}
if (!katze_array_from_xmlDocPtr (array, doc))
{
/* Parsing failed */
xmlFreeDoc (doc);
*error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Malformed document."));
return FALSE;
}
xmlFreeDoc (doc);
return TRUE;
}
#endif
static gboolean static gboolean
katze_array_from_file (KatzeArray* array, katze_array_from_file (KatzeArray* array,
const gchar* filename, const gchar* filename,
@ -573,6 +544,7 @@ katze_array_from_file (KatzeArray* array,
xmlFreeDoc (doc); xmlFreeDoc (doc);
return TRUE; return TRUE;
} }
#endif
#ifdef HAVE_SQLITE #ifdef HAVE_SQLITE
/* Open database 'dbname' */ /* Open database 'dbname' */
@ -1176,9 +1148,10 @@ main (int argc,
error->message); */ error->message); */
g_error_free (error); g_error_free (error);
} }
bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
#ifdef HAVE_LIBXML
katze_assign (config_file, g_build_filename (config_path, "bookmarks.xbel", katze_assign (config_file, g_build_filename (config_path, "bookmarks.xbel",
NULL)); NULL));
bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
error = NULL; error = NULL;
if (!katze_array_from_file (bookmarks, config_file, &error)) if (!katze_array_from_file (bookmarks, config_file, &error))
{ {
@ -1188,7 +1161,9 @@ main (int argc,
g_error_free (error); g_error_free (error);
} }
g_free (config_file); g_free (config_file);
#endif
_session = katze_array_new (KATZE_TYPE_ITEM); _session = katze_array_new (KATZE_TYPE_ITEM);
#ifdef HAVE_LIBXML
g_object_get (settings, "load-on-startup", &load_on_startup, NULL); g_object_get (settings, "load-on-startup", &load_on_startup, NULL);
if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES)
{ {
@ -1203,8 +1178,10 @@ main (int argc,
} }
g_free (config_file); g_free (config_file);
} }
config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); #endif
trash = katze_array_new (KATZE_TYPE_ITEM); trash = katze_array_new (KATZE_TYPE_ITEM);
#ifdef HAVE_LIBXML
config_file = g_build_filename (config_path, "tabtrash.xbel", NULL);
error = NULL; error = NULL;
if (!katze_array_from_file (trash, config_file, &error)) if (!katze_array_from_file (trash, config_file, &error))
{ {
@ -1214,6 +1191,7 @@ main (int argc,
g_error_free (error); g_error_free (error);
} }
g_free (config_file); g_free (config_file);
#endif
#ifdef HAVE_SQLITE #ifdef HAVE_SQLITE
config_file = g_build_filename (config_path, "history.db", NULL); config_file = g_build_filename (config_path, "history.db", NULL);
#endif #endif