diff options
| author |   Dominik Kriegner <dominik.kriegner@aol.at> | 2012-03-11 17:32:50 +0100 |
|---|---|---|
| committer | Dominik Kriegner <dominik.kriegner@aol.at> | 2012-03-11 17:32:50 +0100 |
| commit | bdbb9e713ad4f708ad7071147f3fb0c6d9f8d78f (patch) | |
| tree | 21a41bdd7ac09947f9856dd78774b3a91e03091b | |
| parent | update xrayutilities patch, include latest changes (diff) | |
| download | anaximander-bdbb9e713ad4f708ad7071147f3fb0c6d9f8d78f.tar.gz anaximander-bdbb9e713ad4f708ad7071147f3fb0c6d9f8d78f.tar.bz2 anaximander-bdbb9e713ad4f708ad7071147f3fb0c6d9f8d78f.zip | |
fix several issues with syncevolution
* add patches from upstream bug 20370
* add costum patch to completely fix the issue of 20370
* correct the usage of the xmlrpc use-flag
5 files changed, 3153 insertions, 2 deletions
diff --git a/app-pda/syncevolution/Manifest b/app-pda/syncevolution/Manifest index 38f7b33..052d0a3 100644 --- a/app-pda/syncevolution/Manifest +++ b/app-pda/syncevolution/Manifest @@ -1,5 +1,8 @@ +AUX do-not-check-for-libglade-because-it-is-not-used.patch 1335 RMD160 f84dfa515e3eb077a9971ba30077c2f00898ecb9 SHA1 9284c74f0a2785431eb2558fdc87f6ed4d237c3c SHA256 c920bc8b1de4dd3873529962df553e3ef069b487f00c14337da4bb649592120c +AUX do-not-check-for-or-use-gtk-builder-convert.patch 174711 RMD160 d7f6b68872d9fc2a38b056e918d193a95b22ac1e SHA1 6b242b5795e7deb442f5b4b4427d1dee11cbc707 SHA256 177a1e3b86d4cf50bf91fa14c5201e7c893802364782fd748cfde075b657c20b +AUX do-not-use-gtk-builder-convert.patch 13818 RMD160 2b083379d80c85fedaae7a7754277f9e66ef311d SHA1 714eb926c73a5be8c4cd347fea3c784089dae2d0 SHA256 e787fa7d221a48dce4a5b4f9f90de285d241c87b0c411bd8f41aab8eb4e79931 AUX fix-akonadi-build.patch 475 RMD160 f7c2dab4feb04c9d1366255b08198fc4b75f4259 SHA1 6c9b098c85bb8e7272d10825e71dd016569584c4 SHA256 10ca4d6f2d5d4d859bee4279683c1075993c384ad8a049d2b50f66b856419919 DIST syncevolution-1.2.1.tar.gz 11850619 RMD160 8cb4d307595a2155fbeece2f1c770198f727e328 SHA1 ea758b5e1a3e73147efb7f6a02e52402c5070309 SHA256 4cadbcd66ba3ca5ec9c66976054cff6a71fa46563f5ef98a820073d16ad9271b DIST syncevolution-1.2.2.tar.gz 11823911 RMD160 ed54e13f34a39e0f751c3a30cc7fa6c829203f39 SHA1 2999e494f2650059057910ca49b12e6ee311036e SHA256 46168a2c1fd09cb1d338c0471dd32c3919fea0fb783d0881a28bd04c3dfa028c EBUILD syncevolution-1.2.1.ebuild 1774 RMD160 18bd50cb1275f9de3eabff67a9903601a0db79bd SHA1 4c22396cd530a08a260273b21127dfd09b5081be SHA256 bdeae55e2f86c3b2f428e03c0e6c73669e2085cc3b144de275bb9cb088943076 -EBUILD syncevolution-1.2.2.ebuild 2047 RMD160 9b95e6ea5423afaedaf9b2d74952124bfaa60e3e SHA1 75d8c183aa43be83d32e9ead5f544ecd38288ebb SHA256 27ce44fbd03a27f8a70c30aeabe1312e534091e0568697b63faf8036e9fbc0a2 +EBUILD syncevolution-1.2.2.ebuild 2366 RMD160 48eb9e8cf0fc220774228b8bb34bee8a1469abe7 SHA1 9cc01f3bb9c3752f6156ccab2cdafc5e87af0875 SHA256 32272d7065ddda07e076e55c6bc500a90158031639c69bf07e4e7107cb0a39e6 diff --git a/app-pda/syncevolution/files/do-not-check-for-libglade-because-it-is-not-used.patch b/app-pda/syncevolution/files/do-not-check-for-libglade-because-it-is-not-used.patch new file mode 100644 index 0000000..2243441 --- /dev/null +++ b/app-pda/syncevolution/files/do-not-check-for-libglade-because-it-is-not-used.patch @@ -0,0 +1,39 @@ +From 777795569a39f1cb8440d225e87af53ca7e69f81 Mon Sep 17 00:00:00 2001 +From: Murray Cumming <murrayc@murrayc.com> +Date: Thu, 30 Jun 2011 11:12:53 +0200 +Subject: [PATCH] Do not check for libglade because it is not used. + +--- + HACKING | 2 +- + configure-pre.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/HACKING b/HACKING +index 139a056..19c9d6d 100644 +--- a/HACKING ++++ b/HACKING +@@ -42,7 +42,7 @@ For the GUI and its D-Bus based service backend: + apt-get install libdbus-glib-1-dev \ + xsltproc \ + libglib2.0-dev \ +- libgtk2.0-dev libglade2-dev \ ++ libgtk2.0-dev \ + libgnome-keyring-dev \ + libgconf2-dev libgnomevfs2-dev + +diff --git a/configure-pre.in b/configure-pre.in +index dcefdde..009620e 100644 +--- a/configure-pre.in ++++ b/configure-pre.in +@@ -559,7 +559,7 @@ if test $enable_gui != "no"; then + AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + +- gui_modules="glib-2.0 dbus-glib-1 >= 0.60 gtk+-2.0 libglade-2.0 gio-2.0" ++ gui_modules="glib-2.0 dbus-glib-1 >= 0.60 gtk+-2.0 gio-2.0" + if test $enable_gui = "moblin"; then + AC_DEFINE(USE_MOBLIN_UX, 1, [Use Moblin UI widgets]) + fi +-- +1.7.4.1 + diff --git a/app-pda/syncevolution/files/do-not-check-for-or-use-gtk-builder-convert.patch b/app-pda/syncevolution/files/do-not-check-for-or-use-gtk-builder-convert.patch new file mode 100644 index 0000000..9c5f433 --- /dev/null +++ b/app-pda/syncevolution/files/do-not-check-for-or-use-gtk-builder-convert.patch @@ -0,0 +1,2749 @@ +From 80abc4e26ec7944eef617a8f4fd59537ca99ee60 Mon Sep 17 00:00:00 2001 +From: Murray Cumming <murrayc@murrayc.com> +Date: Thu, 30 Jun 2011 10:56:32 +0200 +Subject: [PATCH] Do not check for, or use, gtk-builder-convert. + +Instead we just add the GtkBuilder-format file to git and the dist, +deleting the old libglade-format file. +--- + configure-pre.in | 2 - + src/gtk-ui/Makefile.am | 6 +- + src/gtk-ui/ui.glade | 1348 ------------------------------------------------ + src/gtk-ui/ui.xml | 1330 +++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 1331 insertions(+), 1355 deletions(-) + delete mode 100644 src/gtk-ui/ui.glade + create mode 100644 src/gtk-ui/ui.xml + +diff --git a/configure-pre.in b/configure-pre.in +index e4e2d20..dcefdde 100644 +--- a/configure-pre.in ++++ b/configure-pre.in +@@ -590,8 +590,6 @@ if test $enable_gui != "no"; then + fi + + PKG_CHECK_MODULES(GUI, $gui_modules) +- +- AC_PATH_PROG([GTK_BUILDER_CONV], gtk-builder-convert) + elif test "$enable_dbus_service" = "yes"; then + # syncevo-dbus-server needs localization + : +diff --git a/src/gtk-ui/Makefile.am b/src/gtk-ui/Makefile.am +index 5f56fb2..dc4c0dc 100644 +--- a/src/gtk-ui/Makefile.am ++++ b/src/gtk-ui/Makefile.am +@@ -29,14 +29,11 @@ themerc_DATA = \ + desktopdir = $(datadir)/applications + + EXTRA_DIST = \ +- ui.glade \ ++ $(glade_DATA) \ + $(themerc_DATA) \ + $(applications_in_files) \ + $(noinst_DATA) + +-ui.xml: ui.glade +- $(GTK_BUILDER_CONV) $< $(@F) +- + # sync-ui: default GUI, could be plain GTK or Moblin UX + # sync-ui-gtk: GTK GUI + # sync-ui-moblin: Moblin UX +@@ -76,6 +73,5 @@ sync_ui_moblin_CFLAGS = $(sync_ui_CFLAGS) + sync_ui_moblin_CPPFLAGS = $(sync_ui_CPPFLAGS) -DUSE_MOBLIN_UX + + CLEANFILES = $(BUILT_SOURCES) \ +- ui.xml \ + sync-moblin.desktop \ + $(applications_generated) +diff --git a/src/gtk-ui/ui.glade b/src/gtk-ui/ui.glade +deleted file mode 100644 +index ed40931..0000000 +--- a/src/gtk-ui/ui.glade ++++ /dev/null +@@ -1,1348 +0,0 @@ +-<?xml version="1.0"?> +-<glade-interface> +- <!-- interface-requires gtk+ 2.10 --> +- <!-- interface-naming-policy toplevel-contextual --> +- <widget class="GtkWindow" id="sync_win"> +- <property name="width_request">1024</property> +- <property name="title" translatable="yes">Sync</property> +- <property name="default_width">800</property> +- <property name="default_height">550</property> +- <child> +- <widget class="GtkVBox" id="window_child"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkHBox" id="hbox2"> +- <property name="visible">True</property> +- <property name="border_width">4</property> +- <property name="spacing">4</property> +- <child> +- <widget class="GtkVBox" id="vbox2"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkFrame" id="main_frame"> +- <property name="visible">True</property> +- <property name="label_xalign">0</property> +- <property name="shadow_type">none</property> +- <child> +- <widget class="GtkVBox" id="main_box"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkHBox" id="hbox3"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkHBox" id="server_icon_box"> +- <property name="width_request">48</property> +- <property name="height_request">48</property> +- <property name="visible">True</property> +- <child> +- <widget class="GtkImage" id="sync_service_image"> +- <property name="visible">True</property> +- <property name="stock">gtk-missing-image</property> +- <property name="icon-size">6</property> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">10</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="sync_service_label"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="yalign">0.20000000298023224</property> +- <property name="use_markup">True</property> +- <property name="ellipsize">end</property> +- <property name="max_width_chars">42</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">5</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="autosync_box"> +- <property name="visible">True</property> +- <property name="border_width">6</property> +- <property name="orientation">vertical</property> +- <property name="spacing">4</property> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="padding">8</property> +- <property name="pack_type">end</property> +- <property name="position">2</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">16</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="vbox5"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkEventBox" id="sync_data_and_type_box"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkVBox" id="vbox15"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkHBox" id="hbox15"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkVBox" id="vbox16"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkHBox" id="service_error_box"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <placeholder/> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="service_box"> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkFrame" id="frame2"> +- <property name="visible">True</property> +- <property name="label_xalign">0</property> +- <property name="shadow_type">none</property> +- <child> +- <widget class="GtkAlignment" id="alignment1"> +- <property name="visible">True</property> +- <property name="top_padding">5</property> +- <property name="left_padding">12</property> +- <child> +- <widget class="GtkVBox" id="sources_box"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- <child> +- <placeholder/> +- <packing> +- <property name="type">label_item</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <placeholder/> +- </child> +- </widget> +- <packing> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">55</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="padding">6</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <placeholder/> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- </child> +- <child> +- <widget class="GtkLabel" id="label13"> +- <property name="visible">True</property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="type">label_item</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="vbox3"> +- <property name="width_request">250</property> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">5</property> +- <child> +- <widget class="GtkVBox" id="vbox9"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkFrame" id="log_frame"> +- <property name="visible">True</property> +- <property name="label_xalign">0</property> +- <property name="shadow_type">in</property> +- <child> +- <widget class="GtkVBox" id="vbox18"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkVBox" id="vbox10"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkHBox" id="hbox7"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkLabel" id="sync_status_label"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="padding">6</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="spinner_box"> +- <property name="height_request">24</property> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkImage" id="spinner_image"> +- <property name="visible">True</property> +- <property name="stock">gtk-missing-image</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">10</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="hbox20"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkVBox" id="info_box"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkHBox" id="no_connection_box"> +- <child> +- <placeholder/> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">5</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">5</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="hbox17"> +- <property name="height_request">25</property> +- <property name="visible">True</property> +- <child> +- <widget class="GtkProgressBar" id="progressbar"> +- <property name="text_xalign">0.029999999329447746</property> +- <property name="ellipsize">end</property> +- </widget> +- <packing> +- <property name="padding">5</property> +- <property name="pack_type">end</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">2</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="hbox6"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkVBox" id="vbox8"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">10</property> +- <child> +- <widget class="GtkLabel" id="action_label"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes" comments="title for the buttons on the right side of main view"><b>Actions</b></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkButton" id="sync_btn"> +- <property name="label">Sync now</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- </widget> +- <packing> +- <property name="fill">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkButton" id="change_service_btn"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- <child> +- <widget class="GtkLabel" id="label15"> +- <property name="visible">True</property> +- <property name="label" translatable="yes" comments="Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines">Change or edit +-sync service</property> +- <property name="justify">center</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="fill">False</property> +- <property name="position">2</property> +- </packing> +- </child> +- <child> +- <widget class="GtkButton" id="emergency_btn"> +- <property name="label" translatable="yes" comments="button in main view, right side. Keep length to 20 characters or so, use two lines if needed">Fix a sync +-emergency</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">3</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">30</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">20</property> +- <property name="position">3</property> +- </packing> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- </widget> +- </child> +- <child> +- <widget class="GtkLabel" id="label18"> +- <property name="visible">True</property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="type">label_item</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="pack_type">end</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- <widget class="GtkWindow" id="services_win"> +- <property name="width_request">1024</property> +- <property name="border_width">5</property> +- <property name="title" translatable="yes">Settings</property> +- <property name="modal">True</property> +- <property name="default_width">800</property> +- <property name="default_height">550</property> +- <property name="destroy_with_parent">True</property> +- <property name="transient_for">sync_win</property> +- <child> +- <widget class="GtkVBox" id="vbox6"> +- <property name="visible">True</property> +- <property name="border_width">4</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkFrame" id="services_list_frame"> +- <property name="visible">True</property> +- <property name="label_xalign">0</property> +- <property name="shadow_type">none</property> +- <child> +- <widget class="GtkScrolledWindow" id="settings_scrolledwindow"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="hscrollbar_policy">never</property> +- <property name="vscrollbar_policy">automatic</property> +- <child> +- <widget class="GtkViewport" id="settings_viewport"> +- <property name="visible">True</property> +- <property name="resize_mode">queue</property> +- <child> +- <widget class="GtkHBox" id="hbox4"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkAlignment" id="alignment_1"> +- <property name="visible">True</property> +- <property name="bottom_padding">12</property> +- <property name="left_padding">36</property> +- <property name="right_padding">12</property> +- <child> +- <widget class="GtkVBox" id="vbox7"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">12</property> +- <child> +- <widget class="GtkVBox" id="vbox13"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">5</property> +- <child> +- <widget class="GtkLabel" id="label8"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes"><big>Network sync</big></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="hbox11"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkLabel" id="label5"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">To sync you'll need a network connection and an account with a sync service. +-We support the following services: </property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkScrolledWindow" id="scrolledwindow"> +- <property name="height_request">300</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="hscrollbar_policy">automatic</property> +- <property name="vscrollbar_policy">automatic</property> +- <child> +- <widget class="GtkViewport" id="viewport1"> +- <property name="visible">True</property> +- <property name="resize_mode">queue</property> +- <child> +- <widget class="GtkVBox" id="services_box"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="position">2</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="hbox14"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkLabel" id="label6"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes">If you don't see your service above but know that your sync provider uses SyncML +-you can setup a service manually.</property> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkButton" id="new_service_btn"> +- <property name="label" translatable="yes">Add new service</property> +- <property name="width_request">150</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">8</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">3</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">8</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="direct_sync_box"> +- <property name="height_request">400</property> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">5</property> +- <child> +- <widget class="GtkLabel" id="label2"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes"><big>Direct sync</big></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="hbox1"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkLabel" id="label3"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Use Bluetooth to Sync your data from one device to another.</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkScrolledWindow" id="device_scrolledwindow"> +- <property name="height_request">300</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="hscrollbar_policy">automatic</property> +- <property name="vscrollbar_policy">automatic</property> +- <child> +- <widget class="GtkViewport" id="viewport2"> +- <property name="visible">True</property> +- <property name="resize_mode">queue</property> +- <child> +- <widget class="GtkVBox" id="devices_box"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="position">2</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="add_bt_device_box"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkLabel" id="label_4"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes">You will need to add Bluetooth devices before they can be synced.</property> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkButton" id="new_device_btn"> +- <property name="label" translatable="yes">Add new device</property> +- <property name="width_request">150</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">8</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">3</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- <child> +- <widget class="GtkLabel" id="label1"> +- <property name="visible">True</property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="type">label_item</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">6</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="settings_close_box"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkButton" id="settings_close_btn"> +- <property name="label" translatable="yes" comments="close button for settings window">Close</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">12</property> +- <property name="pack_type">end</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- <widget class="GtkWindow" id="emergency_win"> +- <property name="width_request">1024</property> +- <property name="border_width">5</property> +- <property name="title" translatable="yes">Sync Emergency</property> +- <property name="modal">True</property> +- <property name="default_width">800</property> +- <property name="default_height">550</property> +- <property name="destroy_with_parent">True</property> +- <property name="transient_for">sync_win</property> +- <child> +- <widget class="GtkVBox" id="vbox14"> +- <property name="visible">True</property> +- <property name="border_width">4</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkFrame" id="emergency_frame"> +- <property name="visible">True</property> +- <property name="label_xalign">0</property> +- <property name="shadow_type">none</property> +- <child> +- <widget class="GtkScrolledWindow" id="emergency_scrolledwindow"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="hscrollbar_policy">never</property> +- <property name="vscrollbar_policy">automatic</property> +- <child> +- <widget class="GtkViewport" id="emergency_viewport"> +- <property name="visible">True</property> +- <property name="resize_mode">queue</property> +- <child> +- <widget class="GtkHBox" id="hbox16"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkVBox" id="vbox20"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">8</property> +- <child> +- <widget class="GtkVBox" id="vbox39"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">8</property> +- <child> +- <widget class="GtkLabel" id="emergency_label"> +- <property name="width_request">800</property> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label">If something has gone horribly wrong you can try a slow sync, start from scratch or restore from backup.</property> +- <property name="wrap">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkExpander" id="emergency_expander"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <child> +- <widget class="GtkAlignment" id="alignment19"> +- <property name="visible">True</property> +- <property name="yscale">0</property> +- <property name="left_padding">20</property> +- <child> +- <widget class="GtkTable" id="emergency_source_table"> +- <property name="visible">True</property> +- <property name="n_rows">2</property> +- <child> +- <widget class="GtkCheckButton" id="checkbutton2"> +- <property name="label" translatable="yes">Calendar</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- </child> +- <child> +- <widget class="GtkCheckButton" id="checkbutton3"> +- <property name="label" translatable="yes">Tasks</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="top_attach">1</property> +- <property name="bottom_attach">2</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- <child> +- <widget class="GtkLabel" id="emergency_expander_label"> +- <property name="visible">True</property> +- <property name="label">Affected data:</property> +- </widget> +- <packing> +- <property name="type">label_item</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">8</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="slow_sync_box"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">5</property> +- <child> +- <widget class="GtkLabel" id="slow_sync_label"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes" comments="a title in emergency view"><big>Slow sync</big></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkAlignment" id="alignment4"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="yalign">0</property> +- <property name="xscale">0</property> +- <property name="left_padding">40</property> +- <property name="right_padding">40</property> +- <child> +- <widget class="GtkHBox" id="hbox19"> +- <property name="visible">True</property> +- <property name="spacing">6</property> +- <child> +- <widget class="GtkButton" id="slow_sync_btn"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- <child> +- <widget class="GtkLabel" id="slow_sync_btn_label"> +- <property name="visible">True</property> +- <property name="xpad">16</property> +- <property name="label" translatable="yes">Slow sync</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="slow_sync_explanation_label"> +- <property name="visible">True</property> +- <property name="xpad">8</property> +- <property name="label" translatable="yes">A slow sync compares items from both sides and tries to merge them. +-This may fail in some cases, leading to duplicates or lost information.</property> +- </widget> +- <packing> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">8</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="vbox1"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">5</property> +- <child> +- <widget class="GtkLabel" id="label14"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes" comments="a title in emergency view"><big>Start from scratch</big></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkAlignment" id="alignment3"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="yalign">0</property> +- <property name="xscale">0</property> +- <property name="left_padding">40</property> +- <property name="right_padding">40</property> +- <child> +- <widget class="GtkHBox" id="hbox13"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkButton" id="refresh_from_server_btn"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- <child> +- <widget class="GtkLabel" id="refresh_from_server_btn_label"> +- <property name="visible">True</property> +- <property name="xpad">16</property> +- <property name="label" translatable="yes">Delete all your local +-information and replace +-with data from Zyb</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label4"> +- <property name="visible">True</property> +- <property name="xpad">15</property> +- <property name="label" translatable="yes" comments="text between the two "start from scratch" buttons in emergency view"><b>or</b></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkButton" id="refresh_from_client_btn"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- <child> +- <widget class="GtkLabel" id="refresh_from_client_btn_label"> +- <property name="visible">True</property> +- <property name="xpad">16</property> +- <property name="label" translatable="yes">Delete all data on Zyb +-and replace with your +-local information</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">2</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">8</property> +- <property name="position">2</property> +- </packing> +- </child> +- <child> +- <widget class="GtkVBox" id="vbox21"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">5</property> +- <child> +- <widget class="GtkLabel" id="label9"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes" comments="a title in emergency view"><big>Restore from backup</big></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkAlignment" id="alignment2"> +- <property name="visible">True</property> +- <property name="resize_mode">queue</property> +- <property name="left_padding">40</property> +- <property name="right_padding">40</property> +- <child> +- <widget class="GtkVBox" id="vbox22"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <child> +- <widget class="GtkLabel" id="label12"> +- <property name="width_request">800</property> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="label" translatable="yes" comments="explanation of "Restore backup" function">Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost.</property> +- <property name="wrap">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkScrolledWindow" id="scrolledwindow2"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="hscrollbar_policy">automatic</property> +- <property name="vscrollbar_policy">automatic</property> +- <child> +- <widget class="GtkViewport" id="backup_viewport"> +- <property name="visible">True</property> +- <property name="resize_mode">queue</property> +- <child> +- <widget class="GtkTable" id="emergency_backup_table"> +- <property name="visible">True</property> +- <property name="n_rows">10</property> +- <property name="n_columns">2</property> +- <property name="row_spacing">16</property> +- <child> +- <widget class="GtkLabel" id="label59"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="ypad">5</property> +- <property name="label">Backup before syncing Dec 5th 2009 16:35</property> +- </widget> +- <packing> +- <property name="top_attach">2</property> +- <property name="bottom_attach">3</property> +- <property name="x_options">GTK_FILL</property> +- <property name="y_options">GTK_FILL</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label69"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="ypad">5</property> +- <property name="label">Backup before syncing Dec 5th 2009 13:35</property> +- </widget> +- <packing> +- <property name="top_attach">3</property> +- <property name="bottom_attach">4</property> +- <property name="x_options">GTK_FILL</property> +- <property name="y_options">GTK_FILL</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label79"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="ypad">5</property> +- <property name="label">Backup before syncing Dec 5th 2009 11:35</property> +- </widget> +- <packing> +- <property name="top_attach">4</property> +- <property name="bottom_attach">5</property> +- <property name="x_options">GTK_FILL</property> +- <property name="y_options">GTK_FILL</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label89"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="ypad">5</property> +- <property name="label">Backup before syncing Dec 3rd</property> +- </widget> +- <packing> +- <property name="top_attach">5</property> +- <property name="bottom_attach">6</property> +- <property name="x_options">GTK_FILL</property> +- <property name="y_options">GTK_FILL</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label109"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="ypad">5</property> +- <property name="label">Backup before syncing Dec 1st</property> +- </widget> +- <packing> +- <property name="top_attach">6</property> +- <property name="bottom_attach">7</property> +- <property name="x_options">GTK_FILL</property> +- <property name="y_options">GTK_FILL</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label29"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="ypad">5</property> +- <property name="label">Backup before syncing yesterday</property> +- </widget> +- <packing> +- <property name="top_attach">1</property> +- <property name="bottom_attach">2</property> +- <property name="x_options">GTK_FILL</property> +- <property name="y_options">GTK_FILL</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label30"> +- <property name="visible">True</property> +- <property name="xalign">0</property> +- <property name="ypad">5</property> +- <property name="label">Backup before syncing two hours ago</property> +- </widget> +- <packing> +- <property name="y_options">GTK_FILL</property> +- </packing> +- </child> +- <child> +- <widget class="GtkButton" id="button1"> +- <property name="label">Restore</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- </widget> +- <packing> +- <property name="left_attach">1</property> +- <property name="right_attach">2</property> +- <property name="x_options">GTK_FILL</property> +- <property name="y_options">GTK_FILL</property> +- <property name="x_padding">16</property> +- </packing> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- <child> +- <placeholder/> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">8</property> +- <property name="position">3</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">40</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- </widget> +- </child> +- <child> +- <widget class="GtkLabel" id="label11"> +- <property name="visible">True</property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="type">label_item</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="emergency_close_box"> +- <property name="visible">True</property> +- <child> +- <widget class="GtkButton" id="emergency_close_btn"> +- <property name="label" translatable="yes" comments="close button for settings window">Close</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="padding">12</property> +- <property name="pack_type">end</property> +- <property name="position">0</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +-</glade-interface> +diff --git a/src/gtk-ui/ui.xml b/src/gtk-ui/ui.xml +new file mode 100644 +index 0000000..7746144 +--- /dev/null ++++ b/src/gtk-ui/ui.xml +@@ -0,0 +1,1330 @@ ++<?xml version="1.0"?> ++<interface> ++ <!-- interface-requires gtk+ 2.10 --> ++ <!-- interface-naming-policy toplevel-contextual --> ++ <object class="GtkWindow" id="sync_win"> ++ <property name="width_request">1024</property> ++ <property name="title" translatable="yes">Sync</property> ++ <property name="default_width">800</property> ++ <property name="default_height">550</property> ++ <child> ++ <object class="GtkVBox" id="window_child"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkHBox" id="hbox2"> ++ <property name="visible">True</property> ++ <property name="border_width">4</property> ++ <property name="spacing">4</property> ++ <child> ++ <object class="GtkVBox" id="vbox2"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkFrame" id="main_frame"> ++ <property name="visible">True</property> ++ <property name="label_xalign">0</property> ++ <property name="shadow_type">none</property> ++ <child> ++ <object class="GtkVBox" id="main_box"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkHBox" id="hbox3"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkHBox" id="server_icon_box"> ++ <property name="width_request">48</property> ++ <property name="height_request">48</property> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkImage" id="sync_service_image"> ++ <property name="visible">True</property> ++ <property name="stock">gtk-missing-image</property> ++ <property name="icon-size">6</property> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">10</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="sync_service_label"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="yalign">0.20000000298023224</property> ++ <property name="use_markup">True</property> ++ <property name="ellipsize">end</property> ++ <property name="max_width_chars">42</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">5</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="autosync_box"> ++ <property name="visible">True</property> ++ <property name="border_width">6</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">4</property> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="padding">8</property> ++ <property name="pack_type">end</property> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">16</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="vbox5"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkEventBox" id="sync_data_and_type_box"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkVBox" id="vbox15"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkHBox" id="hbox15"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkVBox" id="vbox16"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkHBox" id="service_error_box"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="service_box"> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkFrame" id="frame2"> ++ <property name="visible">True</property> ++ <property name="label_xalign">0</property> ++ <property name="shadow_type">none</property> ++ <child> ++ <object class="GtkAlignment" id="alignment1"> ++ <property name="visible">True</property> ++ <property name="top_padding">5</property> ++ <property name="left_padding">12</property> ++ <child> ++ <object class="GtkVBox" id="sources_box"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ <child type="label"> ++ <placeholder/> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ <packing> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="padding">55</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="padding">6</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ <child type="label"> ++ <object class="GtkLabel" id="label13"> ++ <property name="visible">True</property> ++ <property name="use_markup">True</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="vbox3"> ++ <property name="width_request">250</property> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">5</property> ++ <child> ++ <object class="GtkVBox" id="vbox9"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkFrame" id="log_frame"> ++ <property name="visible">True</property> ++ <property name="label_xalign">0</property> ++ <property name="shadow_type">in</property> ++ <child> ++ <object class="GtkVBox" id="vbox18"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkVBox" id="vbox10"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkHBox" id="hbox7"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkLabel" id="sync_status_label"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="padding">6</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="spinner_box"> ++ <property name="height_request">24</property> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkImage" id="spinner_image"> ++ <property name="visible">True</property> ++ <property name="stock">gtk-missing-image</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">10</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox20"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkVBox" id="info_box"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkHBox" id="no_connection_box"> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">5</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">5</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox17"> ++ <property name="height_request">25</property> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkProgressBar" id="progressbar"> ++ <property name="text_xalign">0.029999999329447746</property> ++ <property name="ellipsize">end</property> ++ </object> ++ <packing> ++ <property name="padding">5</property> ++ <property name="pack_type">end</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox6"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkVBox" id="vbox8"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">10</property> ++ <child> ++ <object class="GtkLabel" id="action_label"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property comments="title for the buttons on the right side of main view" name="label" translatable="yes"><b>Actions</b></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="sync_btn"> ++ <property name="label">Sync now</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ </object> ++ <packing> ++ <property name="fill">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="change_service_btn"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ <child> ++ <object class="GtkLabel" id="label15"> ++ <property name="visible">True</property> ++ <property comments="Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines" name="label" translatable="yes">Change or edit ++sync service</property> ++ <property name="justify">center</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="fill">False</property> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="emergency_btn"> ++ <property comments="button in main view, right side. Keep length to 20 characters or so, use two lines if needed" name="label" translatable="yes">Fix a sync ++emergency</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">3</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="padding">30</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">20</property> ++ <property name="position">3</property> ++ </packing> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ </child> ++ <child type="label"> ++ <object class="GtkLabel" id="label18"> ++ <property name="visible">True</property> ++ <property name="use_markup">True</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="pack_type">end</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ <object class="GtkWindow" id="services_win"> ++ <property name="width_request">1024</property> ++ <property name="border_width">5</property> ++ <property name="title" translatable="yes">Settings</property> ++ <property name="modal">True</property> ++ <property name="default_width">800</property> ++ <property name="default_height">550</property> ++ <property name="destroy_with_parent">True</property> ++ <property name="transient_for">sync_win</property> ++ <child> ++ <object class="GtkVBox" id="vbox6"> ++ <property name="visible">True</property> ++ <property name="border_width">4</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkFrame" id="services_list_frame"> ++ <property name="visible">True</property> ++ <property name="label_xalign">0</property> ++ <property name="shadow_type">none</property> ++ <child> ++ <object class="GtkScrolledWindow" id="settings_scrolledwindow"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="hscrollbar_policy">never</property> ++ <property name="vscrollbar_policy">automatic</property> ++ <child> ++ <object class="GtkViewport" id="settings_viewport"> ++ <property name="visible">True</property> ++ <property name="resize_mode">queue</property> ++ <child> ++ <object class="GtkHBox" id="hbox4"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkAlignment" id="alignment_1"> ++ <property name="visible">True</property> ++ <property name="bottom_padding">12</property> ++ <property name="left_padding">36</property> ++ <property name="right_padding">12</property> ++ <child> ++ <object class="GtkVBox" id="vbox7"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">12</property> ++ <child> ++ <object class="GtkVBox" id="vbox13"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">5</property> ++ <child> ++ <object class="GtkLabel" id="label8"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="label" translatable="yes"><big>Network sync</big></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox11"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkLabel" id="label5"> ++ <property name="visible">True</property> ++ <property name="label" translatable="yes">To sync you'll need a network connection and an account with a sync service. ++We support the following services: </property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkScrolledWindow" id="scrolledwindow"> ++ <property name="height_request">300</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="hscrollbar_policy">automatic</property> ++ <property name="vscrollbar_policy">automatic</property> ++ <child> ++ <object class="GtkViewport" id="viewport1"> ++ <property name="visible">True</property> ++ <property name="resize_mode">queue</property> ++ <child> ++ <object class="GtkVBox" id="services_box"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox14"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkLabel" id="label6"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="label" translatable="yes">If you don't see your service above but know that your sync provider uses SyncML ++you can setup a service manually.</property> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="new_service_btn"> ++ <property name="label" translatable="yes">Add new service</property> ++ <property name="width_request">150</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">8</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">3</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="padding">8</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="direct_sync_box"> ++ <property name="height_request">400</property> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">5</property> ++ <child> ++ <object class="GtkLabel" id="label2"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="label" translatable="yes"><big>Direct sync</big></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox1"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkLabel" id="label3"> ++ <property name="visible">True</property> ++ <property name="label" translatable="yes">Use Bluetooth to Sync your data from one device to another.</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkScrolledWindow" id="device_scrolledwindow"> ++ <property name="height_request">300</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="hscrollbar_policy">automatic</property> ++ <property name="vscrollbar_policy">automatic</property> ++ <child> ++ <object class="GtkViewport" id="viewport2"> ++ <property name="visible">True</property> ++ <property name="resize_mode">queue</property> ++ <child> ++ <object class="GtkVBox" id="devices_box"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="add_bt_device_box"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkLabel" id="label_4"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="label" translatable="yes">You will need to add Bluetooth devices before they can be synced.</property> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="new_device_btn"> ++ <property name="label" translatable="yes">Add new device</property> ++ <property name="width_request">150</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">8</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">3</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ <child type="label"> ++ <object class="GtkLabel" id="label1"> ++ <property name="visible">True</property> ++ <property name="use_markup">True</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="padding">6</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="settings_close_box"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkButton" id="settings_close_btn"> ++ <property comments="close button for settings window" name="label" translatable="yes">Close</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">12</property> ++ <property name="pack_type">end</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ <object class="GtkWindow" id="emergency_win"> ++ <property name="width_request">1024</property> ++ <property name="border_width">5</property> ++ <property name="title" translatable="yes">Sync Emergency</property> ++ <property name="modal">True</property> ++ <property name="default_width">800</property> ++ <property name="default_height">550</property> ++ <property name="destroy_with_parent">True</property> ++ <property name="transient_for">sync_win</property> ++ <child> ++ <object class="GtkVBox" id="vbox14"> ++ <property name="visible">True</property> ++ <property name="border_width">4</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkFrame" id="emergency_frame"> ++ <property name="visible">True</property> ++ <property name="label_xalign">0</property> ++ <property name="shadow_type">none</property> ++ <child> ++ <object class="GtkScrolledWindow" id="emergency_scrolledwindow"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="hscrollbar_policy">never</property> ++ <property name="vscrollbar_policy">automatic</property> ++ <child> ++ <object class="GtkViewport" id="emergency_viewport"> ++ <property name="visible">True</property> ++ <property name="resize_mode">queue</property> ++ <child> ++ <object class="GtkHBox" id="hbox16"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkVBox" id="vbox20"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">8</property> ++ <child> ++ <object class="GtkVBox" id="vbox39"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">8</property> ++ <child> ++ <object class="GtkLabel" id="emergency_label"> ++ <property name="width_request">800</property> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="label">If something has gone horribly wrong you can try a slow sync, start from scratch or restore from backup.</property> ++ <property name="wrap">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkExpander" id="emergency_expander"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <child> ++ <object class="GtkAlignment" id="alignment19"> ++ <property name="visible">True</property> ++ <property name="yscale">0</property> ++ <property name="left_padding">20</property> ++ <child> ++ <object class="GtkTable" id="emergency_source_table"> ++ <property name="visible">True</property> ++ <property name="n_rows">2</property> ++ <child> ++ <object class="GtkCheckButton" id="checkbutton2"> ++ <property name="label" translatable="yes">Calendar</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">False</property> ++ <property name="draw_indicator">True</property> ++ </object> ++ </child> ++ <child> ++ <object class="GtkCheckButton" id="checkbutton3"> ++ <property name="label" translatable="yes">Tasks</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">False</property> ++ <property name="draw_indicator">True</property> ++ </object> ++ <packing> ++ <property name="top_attach">1</property> ++ <property name="bottom_attach">2</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ <child type="label"> ++ <object class="GtkLabel" id="emergency_expander_label"> ++ <property name="visible">True</property> ++ <property name="label">Affected data:</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">8</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="slow_sync_box"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">5</property> ++ <child> ++ <object class="GtkLabel" id="slow_sync_label"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property comments="a title in emergency view" name="label" translatable="yes"><big>Slow sync</big></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkAlignment" id="alignment4"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="yalign">0</property> ++ <property name="xscale">0</property> ++ <property name="left_padding">40</property> ++ <property name="right_padding">40</property> ++ <child> ++ <object class="GtkHBox" id="hbox19"> ++ <property name="visible">True</property> ++ <property name="spacing">6</property> ++ <child> ++ <object class="GtkButton" id="slow_sync_btn"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ <child> ++ <object class="GtkLabel" id="slow_sync_btn_label"> ++ <property name="visible">True</property> ++ <property name="xpad">16</property> ++ <property name="label" translatable="yes">Slow sync</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="slow_sync_explanation_label"> ++ <property name="visible">True</property> ++ <property name="xpad">8</property> ++ <property name="label" translatable="yes">A slow sync compares items from both sides and tries to merge them. ++This may fail in some cases, leading to duplicates or lost information.</property> ++ </object> ++ <packing> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">8</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="vbox1"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">5</property> ++ <child> ++ <object class="GtkLabel" id="label14"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property comments="a title in emergency view" name="label" translatable="yes"><big>Start from scratch</big></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkAlignment" id="alignment3"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="yalign">0</property> ++ <property name="xscale">0</property> ++ <property name="left_padding">40</property> ++ <property name="right_padding">40</property> ++ <child> ++ <object class="GtkHBox" id="hbox13"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkButton" id="refresh_from_server_btn"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ <child> ++ <object class="GtkLabel" id="refresh_from_server_btn_label"> ++ <property name="visible">True</property> ++ <property name="xpad">16</property> ++ <property name="label" translatable="yes">Delete all your local ++information and replace ++with data from Zyb</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label4"> ++ <property name="visible">True</property> ++ <property name="xpad">15</property> ++ <property comments="text between the two "start from scratch" buttons in emergency view" name="label" translatable="yes"><b>or</b></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="refresh_from_client_btn"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ <child> ++ <object class="GtkLabel" id="refresh_from_client_btn_label"> ++ <property name="visible">True</property> ++ <property name="xpad">16</property> ++ <property name="label" translatable="yes">Delete all data on Zyb ++and replace with your ++local information</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">8</property> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkVBox" id="vbox21"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <property name="spacing">5</property> ++ <child> ++ <object class="GtkLabel" id="label9"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property comments="a title in emergency view" name="label" translatable="yes"><big>Restore from backup</big></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkAlignment" id="alignment2"> ++ <property name="visible">True</property> ++ <property name="resize_mode">queue</property> ++ <property name="left_padding">40</property> ++ <property name="right_padding">40</property> ++ <child> ++ <object class="GtkVBox" id="vbox22"> ++ <property name="visible">True</property> ++ <property name="orientation">vertical</property> ++ <child> ++ <object class="GtkLabel" id="label12"> ++ <property name="width_request">800</property> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property comments="explanation of "Restore backup" function" name="label" translatable="yes">Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost.</property> ++ <property name="wrap">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkScrolledWindow" id="scrolledwindow2"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="hscrollbar_policy">automatic</property> ++ <property name="vscrollbar_policy">automatic</property> ++ <child> ++ <object class="GtkViewport" id="backup_viewport"> ++ <property name="visible">True</property> ++ <property name="resize_mode">queue</property> ++ <child> ++ <object class="GtkTable" id="emergency_backup_table"> ++ <property name="visible">True</property> ++ <property name="n_rows">10</property> ++ <property name="n_columns">2</property> ++ <property name="row_spacing">16</property> ++ <child> ++ <object class="GtkLabel" id="label59"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="ypad">5</property> ++ <property name="label">Backup before syncing Dec 5th 2009 16:35</property> ++ </object> ++ <packing> ++ <property name="top_attach">2</property> ++ <property name="bottom_attach">3</property> ++ <property name="x_options">GTK_FILL</property> ++ <property name="y_options">GTK_FILL</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label69"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="ypad">5</property> ++ <property name="label">Backup before syncing Dec 5th 2009 13:35</property> ++ </object> ++ <packing> ++ <property name="top_attach">3</property> ++ <property name="bottom_attach">4</property> ++ <property name="x_options">GTK_FILL</property> ++ <property name="y_options">GTK_FILL</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label79"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="ypad">5</property> ++ <property name="label">Backup before syncing Dec 5th 2009 11:35</property> ++ </object> ++ <packing> ++ <property name="top_attach">4</property> ++ <property name="bottom_attach">5</property> ++ <property name="x_options">GTK_FILL</property> ++ <property name="y_options">GTK_FILL</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label89"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="ypad">5</property> ++ <property name="label">Backup before syncing Dec 3rd</property> ++ </object> ++ <packing> ++ <property name="top_attach">5</property> ++ <property name="bottom_attach">6</property> ++ <property name="x_options">GTK_FILL</property> ++ <property name="y_options">GTK_FILL</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label109"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="ypad">5</property> ++ <property name="label">Backup before syncing Dec 1st</property> ++ </object> ++ <packing> ++ <property name="top_attach">6</property> ++ <property name="bottom_attach">7</property> ++ <property name="x_options">GTK_FILL</property> ++ <property name="y_options">GTK_FILL</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label29"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="ypad">5</property> ++ <property name="label">Backup before syncing yesterday</property> ++ </object> ++ <packing> ++ <property name="top_attach">1</property> ++ <property name="bottom_attach">2</property> ++ <property name="x_options">GTK_FILL</property> ++ <property name="y_options">GTK_FILL</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label30"> ++ <property name="visible">True</property> ++ <property name="xalign">0</property> ++ <property name="ypad">5</property> ++ <property name="label">Backup before syncing two hours ago</property> ++ </object> ++ <packing> ++ <property name="y_options">GTK_FILL</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="button1"> ++ <property name="label">Restore</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ </object> ++ <packing> ++ <property name="left_attach">1</property> ++ <property name="right_attach">2</property> ++ <property name="x_options">GTK_FILL</property> ++ <property name="y_options">GTK_FILL</property> ++ <property name="x_padding">16</property> ++ </packing> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ <child> ++ <placeholder/> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="padding">8</property> ++ <property name="position">3</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="padding">40</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ </object> ++ </child> ++ <child type="label"> ++ <object class="GtkLabel" id="label11"> ++ <property name="visible">True</property> ++ <property name="use_markup">True</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="emergency_close_box"> ++ <property name="visible">True</property> ++ <child> ++ <object class="GtkButton" id="emergency_close_btn"> ++ <property comments="close button for settings window" name="label" translatable="yes">Close</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="padding">12</property> ++ <property name="pack_type">end</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++</interface> +-- +1.7.4.1 + diff --git a/app-pda/syncevolution/files/do-not-use-gtk-builder-convert.patch b/app-pda/syncevolution/files/do-not-use-gtk-builder-convert.patch new file mode 100644 index 0000000..90de755 --- /dev/null +++ b/app-pda/syncevolution/files/do-not-use-gtk-builder-convert.patch @@ -0,0 +1,355 @@ +diff -urN a/configure.in b/configure.in +--- a/configure.in 2012-01-13 17:25:49.000000000 +0100 ++++ b/configure.in 2012-03-11 16:50:54.072285628 +0100 +@@ -615,8 +615,6 @@ + fi + + PKG_CHECK_MODULES(GUI, $gui_modules) +- +- AC_PATH_PROG([GTK_BUILDER_CONV], gtk-builder-convert) + elif test "$enable_dbus_service" = "yes"; then + # syncevo-dbus-server needs localization + : +diff -urN a/src/gtk-ui/Makefile.in b/src/gtk-ui/Makefile.in +--- a/src/gtk-ui/Makefile.in 2012-01-13 17:29:03.000000000 +0100 ++++ b/src/gtk-ui/Makefile.in 2012-03-11 16:52:33.313615324 +0100 +@@ -224,7 +224,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +@@ -435,7 +434,7 @@ + + desktopdir = $(datadir)/applications + EXTRA_DIST = \ +- ui.glade \ ++ $(glade_DATA) \ + $(themerc_DATA) \ + $(applications_in_files) \ + $(noinst_DATA) +diff -urN a/configure b/configure +--- a/configure 2012-03-11 16:55:02.590582074 +0100 ++++ b/configure 2012-03-11 17:00:15.834528596 +0100 +@@ -857,7 +857,6 @@ + GUI_PROGRAMS + GETTEXT_PACKAGE + SYNCEVOLUTION_LOCALEDIR +-GTK_BUILDER_CONV + GUI_LIBS + GUI_CFLAGS + GTK_2_18_LIBS +@@ -18802,45 +18801,6 @@ + : + fi + +- # Extract the first word of "gtk-builder-convert", so it can be a program name with args. +-set dummy gtk-builder-convert; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTK_BUILDER_CONV+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- case $GTK_BUILDER_CONV in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GTK_BUILDER_CONV="$GTK_BUILDER_CONV" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTK_BUILDER_CONV="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-GTK_BUILDER_CONV=$ac_cv_path_GTK_BUILDER_CONV +-if test -n "$GTK_BUILDER_CONV"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_BUILDER_CONV" >&5 +-$as_echo "$GTK_BUILDER_CONV" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- + + elif test "$enable_dbus_service" = "yes"; then + # syncevo-dbus-server needs localization +diff -urN a/Makefile.in b/Makefile.in +--- a/Makefile.in 2012-01-13 17:29:03.000000000 +0100 ++++ b/Makefile.in 2012-03-11 17:00:43.672657588 +0100 +@@ -222,7 +222,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/addressbook/Makefile.in b/src/backends/addressbook/Makefile.in +--- a/src/backends/addressbook/Makefile.in 2012-01-13 17:29:01.000000000 +0100 ++++ b/src/backends/addressbook/Makefile.in 2012-03-11 17:04:41.648663300 +0100 +@@ -195,7 +195,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/akonadi/Makefile.in b/src/backends/akonadi/Makefile.in +--- a/src/backends/akonadi/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/akonadi/Makefile.in 2012-03-11 17:04:27.081642336 +0100 +@@ -192,7 +192,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/buteo/Makefile.in b/src/backends/buteo/Makefile.in +--- a/src/backends/buteo/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/buteo/Makefile.in 2012-03-11 17:05:30.845356838 +0100 +@@ -247,7 +247,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/evolution/Makefile.in b/src/backends/evolution/Makefile.in +--- a/src/backends/evolution/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/evolution/Makefile.in 2012-03-11 17:05:43.012539096 +0100 +@@ -215,7 +215,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/file/Makefile.in b/src/backends/file/Makefile.in +--- a/src/backends/file/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/file/Makefile.in 2012-03-11 17:05:19.661108521 +0100 +@@ -191,7 +191,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/kcalextended/Makefile.in b/src/backends/kcalextended/Makefile.in +--- a/src/backends/kcalextended/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/kcalextended/Makefile.in 2012-03-11 17:04:56.831642866 +0100 +@@ -230,7 +230,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/maemo/Makefile.in b/src/backends/maemo/Makefile.in +--- a/src/backends/maemo/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/maemo/Makefile.in 2012-03-11 17:04:16.977321440 +0100 +@@ -193,7 +193,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/qtcontacts/Makefile.in b/src/backends/qtcontacts/Makefile.in +--- a/src/backends/qtcontacts/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/qtcontacts/Makefile.in 2012-03-11 17:05:54.099793935 +0100 +@@ -228,7 +228,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/sqlite/Makefile.in b/src/backends/sqlite/Makefile.in +--- a/src/backends/sqlite/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/sqlite/Makefile.in 2012-03-11 17:05:07.894899314 +0100 +@@ -193,7 +193,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/webdav/Makefile.in b/src/backends/webdav/Makefile.in +--- a/src/backends/webdav/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/webdav/Makefile.in 2012-03-11 17:04:02.283309014 +0100 +@@ -194,7 +194,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/backends/xmlrpc/Makefile.in b/src/backends/xmlrpc/Makefile.in +--- a/src/backends/xmlrpc/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/backends/xmlrpc/Makefile.in 2012-03-11 17:06:06.378968667 +0100 +@@ -192,7 +192,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/dbus/glib/Makefile.in b/src/dbus/glib/Makefile.in +--- a/src/dbus/glib/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/dbus/glib/Makefile.in 2012-03-11 17:03:05.414131158 +0100 +@@ -216,7 +216,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/dbus/interfaces/Makefile.in b/src/dbus/interfaces/Makefile.in +--- a/src/dbus/interfaces/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/dbus/interfaces/Makefile.in 2012-03-11 17:03:28.805559033 +0100 +@@ -161,7 +161,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/dbus/Makefile.in b/src/dbus/Makefile.in +--- a/src/dbus/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/dbus/Makefile.in 2012-03-11 17:03:17.013351580 +0100 +@@ -173,7 +173,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/dbus/qt/Makefile.in b/src/dbus/qt/Makefile.in +--- a/src/dbus/qt/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/dbus/qt/Makefile.in 2012-03-11 17:03:39.644830532 +0100 +@@ -253,7 +253,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/gdbus/Makefile.in b/src/gdbus/Makefile.in +--- a/src/gdbus/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/gdbus/Makefile.in 2012-03-11 17:08:00.355308487 +0100 +@@ -201,7 +201,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/gnome-bluetooth/Makefile.in b/src/gnome-bluetooth/Makefile.in +--- a/src/gnome-bluetooth/Makefile.in 2012-01-13 17:29:02.000000000 +0100 ++++ b/src/gnome-bluetooth/Makefile.in 2012-03-11 17:07:21.861895566 +0100 +@@ -178,7 +178,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/gtk-ui/Makefile.in b/src/gtk-ui/Makefile.in +--- a/src/gtk-ui/Makefile.in 2012-03-11 16:55:02.917560097 +0100 ++++ b/src/gtk-ui/Makefile.in 2012-03-11 17:06:47.048235338 +0100 +@@ -1159,9 +1159,6 @@ + sync-moblin.desktop: sync.desktop + cp $< $@ + +-ui.xml: ui.glade +- $(GTK_BUILDER_CONV) $< $(@F) +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -urN a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in 2012-01-13 17:29:01.000000000 +0100 ++++ b/src/Makefile.in 2012-03-11 17:08:49.985972903 +0100 +@@ -471,7 +471,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/syncevo/configs/Makefile.in b/src/syncevo/configs/Makefile.in +--- a/src/syncevo/configs/Makefile.in 2012-01-13 17:29:03.000000000 +0100 ++++ b/src/syncevo/configs/Makefile.in 2012-03-11 17:07:40.156666004 +0100 +@@ -158,7 +158,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/syncevo/Makefile.in b/src/syncevo/Makefile.in +--- a/src/syncevo/Makefile.in 2012-01-13 17:29:03.000000000 +0100 ++++ b/src/syncevo/Makefile.in 2012-03-11 17:08:37.272827329 +0100 +@@ -314,7 +314,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/src/synthesis-includes/Makefile.in b/src/synthesis-includes/Makefile.in +--- a/src/synthesis-includes/Makefile.in 2012-01-13 17:29:03.000000000 +0100 ++++ b/src/synthesis-includes/Makefile.in 2012-03-11 17:07:05.662984270 +0100 +@@ -140,7 +140,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ +diff -urN a/test/Makefile.in b/test/Makefile.in +--- a/test/Makefile.in 2012-01-13 17:29:03.000000000 +0100 ++++ b/test/Makefile.in 2012-03-11 17:08:10.562622472 +0100 +@@ -133,7 +133,6 @@ + GTHREAD_LIBS = @GTHREAD_LIBS@ + GTK_2_18_CFLAGS = @GTK_2_18_CFLAGS@ + GTK_2_18_LIBS = @GTK_2_18_LIBS@ +-GTK_BUILDER_CONV = @GTK_BUILDER_CONV@ + GUI_CFLAGS = @GUI_CFLAGS@ + GUI_DESKTOP_FILES = @GUI_DESKTOP_FILES@ + GUI_LIBS = @GUI_LIBS@ diff --git a/app-pda/syncevolution/syncevolution-1.2.2.ebuild b/app-pda/syncevolution/syncevolution-1.2.2.ebuild index 286a198..a50e940 100644 --- a/app-pda/syncevolution/syncevolution-1.2.2.ebuild +++ b/app-pda/syncevolution/syncevolution-1.2.2.ebuild @@ -48,6 +48,11 @@ DOCS="README NEWS AUTHORS HACKING" src_prepare() { epatch "${FILESDIR}/fix-akonadi-build.patch" + # patches from bugs.meego.com #20370 + epatch "${FILESDIR}/do-not-check-for-or-use-gtk-builder-convert.patch" + epatch "${FILESDIR}/do-not-check-for-libglade-because-it-is-not-used.patch" + # additional patch to remove the usage and check for gtk-builder-convert + epatch "${FILESDIR}/do-not-use-gtk-builder-convert.patch" } pkg_setup() { @@ -62,7 +67,7 @@ pkg_setup() { $(use_enable keyring gnome-keyring) $(use_enable kwallet) $(use_enable xmlrpc) - $(use_enable xmlrpc sqlite3) + $(use_enable xmlrpc sqlite) $(use_enable xmlrpc file)" if use bluetooth; then G2CONF="${G2CONF} |