From cd6eee46a7405bc2365ada5ca7cd2daab01e06c0 Mon Sep 17 00:00:00 2001
From: Siteshwar Vashisht <siteshwar@gmail.com>
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/sync/sync_host_type.ui | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/sync/sync_host_type.ui')

diff --git a/src/sync/sync_host_type.ui b/src/sync/sync_host_type.ui
index 6eb875dc..ba96ab83 100644
--- a/src/sync/sync_host_type.ui
+++ b/src/sync/sync_host_type.ui
@@ -24,6 +24,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QRadioButton" name="googleRadioButton">
+        <property name="text">
+         <string>Google Bookmarks</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QRadioButton" name="nullRadioButton">
         <property name="text">
-- 
cgit v1.2.1