Commit graph

46 commits

Author SHA1 Message Date
Sergio Durigan Junior ccd28b22eb Imported Upstream version 0.5.11 2015-09-11 20:47:06 -04:00
Ryan Niebur 50549da7c3 Imported Upstream version 0.5.2+dfsg 2013-10-23 20:45:02 -07:00
Ryan Niebur 405f565df8 Imported Upstream version 0.4.3+dfsg 2013-10-23 20:26:27 -07:00
Oliver Hanraths f840f0508c Bookmarks: Database structure improved
The new format uses bookmarks_v2.db.

We require sqlite 3.6.19 now due to foreign keys.

Fixes: https://bugs.launchpad.net/midori/+bug/836707
2012-06-20 01:19:30 +02:00
Christian Dywan 7940a02ae8 Don't re-add toplevel items in recursive item query 2012-03-08 22:20:04 +01:00
Christian Dywan 81250720de Introduce midori_array_query_recursive
This effectively fixes bookmark export.

Fixes: https://bugs.launchpad.net/bugs/906837
2012-01-03 21:15:19 +01:00
Christian Dywan c8b19b2eeb Avoid copying of strings and making tiny allocations 2011-12-11 02:57:04 +01:00
Christian Dywan 668689fd17 Use struct members in katze_item_set_value_from_column 2011-11-28 23:35:58 +01:00
Christian Dywan e4963aa324 Introduce midori_array_query to unify bookmark queries
This ensures querying is consistently quoted and ordered.
2011-11-23 00:23:41 +01:00
Christian Dywan 49758e4dd8 Ensure data is initialized in midori_array_to_file_format 2011-11-15 18:34:19 +01:00
Paweł Forysiuk bbfa7f6030 Fix GCC 4.6 warnings about set but unused variables 2011-04-29 04:03:33 +02:00
Paweł Forysiuk 2c4015ab94 Unescape HTML entities when importing bookmarks from Netscape HTML. 2011-02-17 20:15:35 +01:00
Paweł Forysiuk b63444f3cb Escape bookmark items when exporting to Netscape HTML 2011-02-16 00:19:17 +01:00
Paweł Forysiuk ab7b069769 Add support for exporting to Netscape HTML 2011-02-01 01:25:26 +01:00
Paweł Forysiuk 7368ca00c1 Remove unneeded check in HTML import function.
It was triggering a missleading warning at the last line of file
giving the impression of interrupted and broken import.
2011-01-30 18:58:00 +01:00
Paweł Forysiuk 74bb09b8c7 Rename HTML import function from mozilla to netscape to be more consistent. 2011-01-30 18:58:00 +01:00
Paweł Forysiuk 4ed49d001f Add initial support for HTML bookmarks import 2011-01-29 08:59:20 +01:00
Paweł Forysiuk 2e8d6558d0 Use KATZE_ARRAY_FOREACH_ITEM_L for export 2011-01-22 21:17:08 +01:00
Paweł Forysiuk e96ac0fabc Use GIOChannel to import Opera bookmarks
The workaround for long lines is no longer needed.
2010-12-30 20:05:16 +01:00
Christian Dywan 40dc38fd21 Implement and use KATZE_ARRAY_FOREACH_ITEM
Iterating an array by a GList is considerably faster than
continuously retrieving items, however it is also a lot
more complicated. So the new macro takes care of that and
uses a new semi-private function to avoid copying the list.

Note that the macro can't be nested, which basically isn't
useful in practise anyway.
2010-09-12 00:59:24 +02:00
Alexander Butenko 5e250cc70d Store 'description' property of a bookmark 2010-07-23 22:04:20 +02:00
Alexander Butenko 2caaed659c Remove last bits of 'type' field usage 2010-07-03 22:33:45 +02:00
Alexander Butenko 659b7c351e Add 'folder' property to bookmarks 2010-07-03 22:33:45 +02:00
Christian Dywan 93b0b9029b Check absent 'version' in toplevel 'xbel' element
Albeit required, in pracise the 'version' value may be missing.
2010-07-02 23:06:10 +02:00
Alexander Butenko 60593b27d1 Skip bookmark URIS starting with '('
Due to a bug in the sqlite handling we were happily adding
folders with '(null') and it happened to work until now.
2010-07-01 23:37:14 +02:00
Alexander Butenko bd97f069d4 Introduce katze_array_from_sqlite () and katze_array_from_statement () 2010-07-01 23:37:13 +02:00
Alexander Butenko 045cc81b45 Use g_access instead of g_file_test consistently 2009-12-19 11:28:46 +01:00
Christian Dywan 50b37c3f28 Parse meta info for array from xmlNodePtr 2009-12-11 23:43:56 +01:00
Christian Dywan ca6174ba6c Support RDF bookmarks, and add Epiphany to Import bookmarks 2009-12-05 23:43:12 +01:00
Christian Dywan da0304964e Refactor XBEL writing to use GString and filter out control characters
The writing becomes faster because we avoid some redundant allocations
and we improve XML compatibility by filtering out control characters
which are not supported in Midori.
2009-12-03 23:13:15 +01:00
Christian Dywan ded1573054 Handle long lines when importing Opera bookmarks 2009-12-02 23:46:34 +01:00
Christian Dywan aa5b5850c0 Optimize string assignments and comparisons in XBEL loading
We can do fast string comparisons in places where we know that
strings are not NULL.

We can directly assign values to items we create ourselves.
2009-12-01 03:17:50 +01:00
Christian Dywan 56b0a55a2d Improve XBEL format compatibility and support bookmark sharing
Loading of XBEL needs to handle title and desc children of the root
element. This is equal to using the according properties.

MicroB uses metadata without an owner and uses children rather than
properties. This is against the spec but we want to handle that.

A key value leak was plugged.

If the bookmark file is absolute, we assume it is a foreign file
and we shouldn't overwrite it.
2009-11-30 19:36:15 +01:00
Christian Dywan 3b573328cc Only show bookmarks in the toolbar which are marked as such 2009-11-23 20:46:00 +01:00
Christian Dywan 308b9dd07d Support importing bookmarks from Opera 6 bookmark files 2009-11-16 17:45:09 +01:00
Christian Dywan 1ead8e8886 Save back and forward history in the session (disabled) 2009-09-26 22:19:34 +02:00
Christian Dywan e3b27cb70d Only set error in midori_array_from_file if it is not NULL 2009-08-29 01:23:10 +02:00
Christian Dywan f492a28764 Don't save empty metadata keys to XBEL 2009-07-18 16:37:01 +02:00
Christian Dywan afc414e7e3 Skip "owner" elements, these are not metadata keys 2009-07-18 16:24:56 +02:00
Christian Dywan 967ad910ed Read metadata from XBEL elements other than the root folder 2009-07-18 16:16:39 +02:00
Christian Dywan dc440e85db Save metadata of items other than the root folder 2009-07-18 15:49:25 +02:00
Christian Dywan 8ad4e3585f Cast xmlChar* to gchar* when setting the meta string 2009-07-09 18:43:57 +01:00
Christian Dywan 491fadc119 Read metadata keys from XBEL 2009-07-06 18:32:44 +01:00
Christian Dywan ab6ecc1625 Store meta data in XBEL when saving KatzeArray objects 2009-07-05 00:14:39 +01:00
Christian Dywan eed273b35e Fix memory leaks in a number of places 2009-04-05 23:46:15 +02:00
Christian Dywan dbc4c3f743 Move array loading and saving to midori_array_{from,to}_file
This not only takes the code out of main but in the future
will allow extensions to use and enhance it.
2009-03-31 18:09:04 +02:00