From cd6eee46a7405bc2365ada5ca7cd2daab01e06c0 Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Mon, 23 Apr 2012 01:18:01 +0200 Subject: Google Sync Bookmarks in rekonq! - Added UI bits to configure Google Bookamrks Sync - Implemented sync, 2-way merging local and remote bk - Remember to not update local history while remotely adding bookmarks - Encode parameters of add bookmarks request while posting data. - (adjam) fix compile warnings This is the squashed commit of Situ's work on Google Bookmarks Sync SQUASHED BY: adjam ;) REVIEW: 104673 DIGEST: Google Bookmarks Sync REVIEWED BY: adjam --- src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac4fa87b..1180ad0d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -99,6 +99,7 @@ SET( rekonq_KDEINIT_SRCS useragent/useragentwidget.cpp #---------------------------------------- sync/ftpsynchandler.cpp + sync/googlesynchandler.cpp sync/syncassistant.cpp sync/synchandler.cpp sync/syncmanager.cpp @@ -107,6 +108,7 @@ SET( rekonq_KDEINIT_SRCS sync/syncdatawidget.cpp sync/synchosttypewidget.cpp sync/syncftpsettingswidget.cpp + sync/syncgooglesettingswidget.cpp ) @@ -130,6 +132,7 @@ KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS sync/sync_check.ui sync/sync_data.ui sync/sync_ftp_settings.ui + sync/sync_google_settings.ui sync/sync_host_type.ui ) -- cgit v1.2.1