tags 241821 + patch
severity 241821 important
tags 256804 + patch
tags 279461 + patch
thanks mate
Hi,
Attached is a patch which fixes a few small bugs but most importantly adds
the much needed wbxml support to the syncml plugin, simply by building with
the former -dev package installed.
As this is direly needed with heaps of current smartphones (virtually all
Symbian based ones, TTBOMK) this is rather important. And as it was promised
for 0.82-3 already, but still hasn't been included, I will NMU within a
couple of days - unless you have serious objections or upload yourself.
Regards,
Filip
--
/* Amuse the user. */
\|/ ____ \|/
"@'/ ,. \`@"
/_| \__/ |_\
\__U_/
-- /usr/src/linux-2.4.2/arch/sparc/kernel/traps.c::die_if_kernel()
--- multisync-0.82.orig/debian/changelog
+++ multisync-0.82/debian/changelog
@@ -1,3 +1,17 @@
+multisync (0.82-3.3) unstable; urgency=low
+
+ * NMU.
+ * Drop libsoup2.0-dev from builddeps, libsoup2.2-dev is automatically pulled
+ in already. Builddepend on libglade2-dev and libxml2-dev instead of
+ libglade-dev and libxml-dev, respectively, to avoid the older
+ libglade0-dev and libxml-dev being installed together with the current
+ ones. Also build with libcurl3-dev. (Closes: #279461)
+ * Update SyncML plugin from upstream CVS snapshot.
+ * Add wbxml support. (Closes: #241821)
+ * Add libmultisync-plugin-palm to -all dependencies. (Closes: #256804)
+
+ -- Filip Van Raemdonck <[EMAIL PROTECTED]> Thu, 13 Jan 2005 23:02:19 +0100
+
multisync (0.82-3.2) unstable; urgency=low
* Non-maintainer upload.
--- multisync-0.82.orig/debian/control
+++ multisync-0.82/debian/control
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Mikael Sennerholm <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), libgnome2-dev, libxml-dev,
libbonobo2-dev, liborbit2-dev (>= 1:2.8), libglade-dev, libgnomeui-dev,
libgnomeprintui2.2-dev , heimdal-dev, libsoup2.0-dev, libgal2.0-dev,
bluez-utils, libbluetooth1-dev, libopenobex-dev, libssl-dev, libcurl-dev,
autotools-dev, automake1.6, libpisock-dev, evolution-data-server-dev
+Build-Depends: debhelper (>> 3.0.0), libgnome2-dev, libbonobo2-dev,
liborbit2-dev (>= 1:2.8), libglade2-dev, libgnomeui-dev, libgnomeprintui2.2-dev
, heimdal-dev, libgal2.0-dev, bluez-utils, libbluetooth1-dev, libopenobex-dev,
libssl-dev, libcurl3-dev, autotools-dev, automake1.6, libpisock-dev,
evolution-data-server-dev, libwbxml2-dev
Standards-Version: 3.5.8
Package: multisync
@@ -23,9 +23,9 @@
Package: libmultisync-plugin-all
Section: libs
Architecture: all
-Depends: multisync, libmultisync-plugin-evolution, libmultisync-plugin-backup,
libmultisync-plugin-irmc, libmultisync-plugin-irmc-bluetooth,
libmultisync-plugin-syncml ,libmultisync-plugin-opie
-Description: Pseudo package wish depends on all plugins for MultiSync
- Install this package if you want all plugins to be installed.
+Depends: multisync, libmultisync-plugin-evolution, libmultisync-plugin-backup,
libmultisync-plugin-irmc, libmultisync-plugin-irmc-bluetooth,
libmultisync-plugin-syncml, libmultisync-plugin-opie, libmultisync-plugin-palm
+Description: Complete MultiSync suite
+ These are all MultiSync plugins currently available in Debian.
.
Homepage http://multisync.sourceforge.net
--- multisync-0.82.orig/plugins/syncml_plugin/configure
+++ multisync-0.82/plugins/syncml_plugin/configure
@@ -21561,7 +21561,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <wbxml2/wbxml.h>
+#include <wbxml.h>
int
main ()
{
--- multisync-0.82.orig/plugins/syncml_plugin/configure.in
+++ multisync-0.82/plugins/syncml_plugin/configure.in
@@ -30,7 +30,7 @@
dnl Check for 0.8.1 or later of libwbxml2
AC_CHECK_LIB(wbxml2, wbxml_conv_wbxml2xml)
AC_MSG_CHECKING(for correct libwbxml2 version)
-AC_TRY_COMPILE([#include <wbxml2/wbxml.h>],[WBXMLConvXML2WBXMLParams w;
w.wbxml_version = WBXML_VERSION_11
],AC_MSG_RESULT(yes);LIBWBXML=1,AC_MSG_RESULT(no);LIBWBXML=0)
+AC_TRY_COMPILE([#include <wbxml.h>],[WBXMLConvXML2WBXMLParams w;
w.wbxml_version = WBXML_VERSION_11
],AC_MSG_RESULT(yes);LIBWBXML=1,AC_MSG_RESULT(no);LIBWBXML=0)
AC_DEFINE_UNQUOTED(USE_LIBWBXML, ${LIBWBXML},Defined if the correct libwbxml2
version exists.)
if test "x${LIBWBXML}" = "x0"; then
echo "To enable WBXML communication (for e.g. cell phones) you must have
version 0.8.1 or later of libwbxml2."
--- multisync-0.82.orig/plugins/syncml_plugin/src/Makefile.am
+++ multisync-0.82/plugins/syncml_plugin/src/Makefile.am
@@ -5,7 +5,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)/multisync"\" \
@PACKAGE_CFLAGS@ -I$(top_srcdir)/include \
- -I../../../include -I/usr/include/wbxml2
+ -I../../../include
AM_CFLAGS = -g
--- multisync-0.82.orig/plugins/syncml_plugin/src/Makefile.in
+++ multisync-0.82/plugins/syncml_plugin/src/Makefile.in
@@ -143,7 +143,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)/multisync"\" \
@PACKAGE_CFLAGS@ -I$(top_srcdir)/include \
- -I../../../include -I/usr/include/wbxml2
+ -I../../../include
AM_CFLAGS = -g
--- multisync-0.82.orig/plugins/syncml_plugin/src/gui.c
+++ multisync-0.82/plugins/syncml_plugin/src/gui.c
@@ -173,6 +173,9 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(syncmlwindow,
"removeutccheck")), syncmlconn->removeutc);
+
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(syncmlwindow,
+
"disablestrtbl")), syncmlconn->disablestrtbl);
gtk_widget_show (syncmlwindow);
}
@@ -248,6 +251,7 @@
g_strdup_printf("%s://%s/%s", protoname, hostname, pathname);
syncmlconn->removeutc =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(syncmlwindow,"removeutccheck")));
+ syncmlconn->disablestrtbl =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(syncmlwindow,"disablestrtbl")));
return(TRUE);
}
--- multisync-0.82.orig/plugins/syncml_plugin/src/interface.c
+++ multisync-0.82/plugins/syncml_plugin/src/interface.c
@@ -122,6 +122,7 @@
GtkWidget *label25;
GtkWidget *table5;
GtkWidget *removeutccheck;
+ GtkWidget *disablestrtbl;
GtkWidget *label23;
GtkWidget *hseparator1;
GtkWidget *hbuttonbox1;
@@ -152,7 +153,6 @@
gtk_widget_show (label17);
gtk_box_pack_start (GTK_BOX (vbox2), label17, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label17), TRUE);
- gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label17), 0, 0.5);
hbox1 = gtk_hbox_new (FALSE, 0);
@@ -162,7 +162,6 @@
label16 = gtk_label_new (" ");
gtk_widget_show (label16);
gtk_box_pack_start (GTK_BOX (hbox1), label16, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label16), GTK_JUSTIFY_LEFT);
rolemenu = gtk_option_menu_new ();
gtk_widget_show (rolemenu);
@@ -179,7 +178,6 @@
gtk_widget_show (label18);
gtk_box_pack_start (GTK_BOX (vbox2), label18, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label18), TRUE);
- gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label18), 0, 0.5);
hbox2 = gtk_hbox_new (FALSE, 0);
@@ -189,7 +187,6 @@
label19 = gtk_label_new (" ");
gtk_widget_show (label19);
gtk_box_pack_start (GTK_BOX (hbox2), label19, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label19), GTK_JUSTIFY_LEFT);
table2 = gtk_table_new (2, 7, FALSE);
gtk_widget_show (table2);
@@ -215,6 +212,7 @@
gtk_table_attach (GTK_TABLE (table2), label4, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_CENTER);
hostnameentry = gtk_entry_new ();
gtk_widget_show (hostnameentry);
@@ -228,6 +226,7 @@
gtk_table_attach (GTK_TABLE (table2), label5, 3, 4, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label5), GTK_JUSTIFY_CENTER);
portentry = gtk_entry_new ();
gtk_widget_show (portentry);
@@ -243,6 +242,7 @@
gtk_table_attach (GTK_TABLE (table2), label6, 5, 6, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label6), GTK_JUSTIFY_CENTER);
pathentry = gtk_entry_new ();
gtk_widget_show (pathentry);
@@ -256,6 +256,7 @@
gtk_table_attach (GTK_TABLE (table2), label8, 2, 3, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label8), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5);
label9 = gtk_label_new ("Port:");
@@ -263,6 +264,7 @@
gtk_table_attach (GTK_TABLE (table2), label9, 3, 6, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.5);
label10 = gtk_label_new ("Path:");
@@ -270,6 +272,7 @@
gtk_table_attach (GTK_TABLE (table2), label10, 6, 7, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label10), 0, 0.5);
label7 = gtk_label_new ("Protocol:");
@@ -277,13 +280,13 @@
gtk_table_attach (GTK_TABLE (table2), label7, 0, 2, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label7), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label7), 0, 0.5);
label20 = gtk_label_new ("<span weight='bold'>Authentication:</span>");
gtk_widget_show (label20);
gtk_box_pack_start (GTK_BOX (vbox2), label20, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label20), TRUE);
- gtk_label_set_justify (GTK_LABEL (label20), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label20), 0, 0.5);
hbox3 = gtk_hbox_new (FALSE, 0);
@@ -293,7 +296,6 @@
label21 = gtk_label_new (" ");
gtk_widget_show (label21);
gtk_box_pack_start (GTK_BOX (hbox3), label21, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label21), GTK_JUSTIFY_LEFT);
table3 = gtk_table_new (2, 2, FALSE);
gtk_widget_show (table3);
@@ -306,6 +308,7 @@
gtk_table_attach (GTK_TABLE (table3), label11, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5);
label12 = gtk_label_new ("SyncML password:");
@@ -313,6 +316,7 @@
gtk_table_attach (GTK_TABLE (table3), label12, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label12), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label12), 0, 0.5);
loginentry = gtk_entry_new ();
@@ -334,6 +338,7 @@
label1 = gtk_label_new ("SyncML Role");
gtk_widget_show (label1);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1),
gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label1);
+ gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_CENTER);
table4 = gtk_table_new (3, 2, FALSE);
gtk_widget_show (table4);
@@ -347,6 +352,7 @@
gtk_table_attach (GTK_TABLE (table4), label14, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label14), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label14), 0, 0.5);
calendarcombo = gtk_combo_new ();
@@ -368,6 +374,7 @@
gtk_table_attach (GTK_TABLE (table4), label15, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label15), 0, 0.5);
phonebookcombo = gtk_combo_new ();
@@ -405,11 +412,11 @@
label22 = gtk_label_new_with_mnemonic ("Get from server...");
gtk_widget_show (label22);
gtk_box_pack_start (GTK_BOX (hbox4), label22, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label22), GTK_JUSTIFY_LEFT);
label13 = gtk_label_new ("Databases");
gtk_widget_show (label13);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1),
gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label13);
+ gtk_label_set_justify (GTK_LABEL (label13), GTK_JUSTIFY_CENTER);
vbox3 = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox3);
@@ -420,7 +427,6 @@
gtk_widget_show (label24);
gtk_box_pack_start (GTK_BOX (vbox3), label24, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label24), TRUE);
- gtk_label_set_justify (GTK_LABEL (label24), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label24), 0, 0.5);
hbox5 = gtk_hbox_new (FALSE, 0);
@@ -430,9 +436,8 @@
label25 = gtk_label_new (" ");
gtk_widget_show (label25);
gtk_box_pack_start (GTK_BOX (hbox5), label25, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label25), GTK_JUSTIFY_LEFT);
- table5 = gtk_table_new (1, 2, FALSE);
+ table5 = gtk_table_new (2, 1, FALSE);
gtk_widget_show (table5);
gtk_box_pack_start (GTK_BOX (hbox5), table5, TRUE, TRUE, 0);
gtk_table_set_row_spacings (GTK_TABLE (table5), 3);
@@ -440,15 +445,21 @@
removeutccheck = gtk_check_button_new_with_mnemonic ("Interpret UTC as local
time (Symbian Devices)");
gtk_widget_show (removeutccheck);
- gtk_table_attach (GTK_TABLE (table5), removeutccheck, 0, 2, 0, 1,
+ gtk_table_attach (GTK_TABLE (table5), removeutccheck, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, removeutccheck, "If this option is enabled,
times from the other end will be interpreted as being local time even if they
are stated to be in UTC. This is a common bug among some Symbian devices such
as SE P800/P900.", NULL);
+ disablestrtbl = gtk_check_button_new_with_mnemonic ("Disable string tables");
+ gtk_widget_show (disablestrtbl);
+ gtk_table_attach (GTK_TABLE (table5), disablestrtbl, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_tooltips_set_tip (tooltips, disablestrtbl, "If this option is enabled,
times from the other end will be interpreted as being local time even if they
are stated to be in UTC. This is a common bug among some Symbian devices such
as SE P800/P900.", NULL);
+
label23 = gtk_label_new ("Options");
gtk_widget_show (label23);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1),
gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label23);
- gtk_label_set_justify (GTK_LABEL (label23), GTK_JUSTIFY_LEFT);
hseparator1 = gtk_hseparator_new ();
gtk_widget_show (hseparator1);
@@ -541,6 +552,7 @@
GLADE_HOOKUP_OBJECT (syncml_optwin, label25, "label25");
GLADE_HOOKUP_OBJECT (syncml_optwin, table5, "table5");
GLADE_HOOKUP_OBJECT (syncml_optwin, removeutccheck, "removeutccheck");
+ GLADE_HOOKUP_OBJECT (syncml_optwin, disablestrtbl, "disablestrtbl");
GLADE_HOOKUP_OBJECT (syncml_optwin, label23, "label23");
GLADE_HOOKUP_OBJECT (syncml_optwin, hseparator1, "hseparator1");
GLADE_HOOKUP_OBJECT (syncml_optwin, hbuttonbox1, "hbuttonbox1");
--- multisync-0.82.orig/plugins/syncml_plugin/src/syncml_cmd.c
+++ multisync-0.82/plugins/syncml_plugin/src/syncml_cmd.c
@@ -31,7 +31,7 @@
*/
/*
- * $Id: syncml_cmd.c,v 1.38 2004/04/03 17:08:02 lincoln Exp $
+ * $Id: syncml_cmd.c,v 1.38.2.1 2004/09/09 17:13:49 azrael2 Exp $
*/
#include <string.h>
@@ -366,7 +366,14 @@
WB_UTINY *wbxml = NULL, *xml;
WB_LONG wbxml_len = 0;
WBXMLError res = 0;
- WBXMLConvXML2WBXMLParams params = {WBXML_VERSION_11, TRUE, TRUE};
+
+ WBXMLConvXML2WBXMLParams params = {WBXML_VERSION_11, TRUE, TRUE};
+
+ syncml_connection *syncmlconn = state->userdata;
+ if (syncmlconn->disablestrtbl) {
+ params.use_strtbl = FALSE;
+ }
+
xml = in;
if ((res = wbxml_conv_xml2wbxml(xml, &wbxml, &wbxml_len, ¶ms)) ==
WBXML_OK) {
--- multisync-0.82.orig/plugins/syncml_plugin/src/syncml_plugin.c
+++ multisync-0.82/plugins/syncml_plugin/src/syncml_plugin.c
@@ -31,7 +31,7 @@
*/
/*
- * $Id: syncml_plugin.c,v 1.40 2004/04/06 09:47:22 lincoln Exp $
+ * $Id: syncml_plugin.c,v 1.40.2.1 2004/09/09 17:13:49 azrael2 Exp $
*/
#include <stdio.h>
@@ -459,6 +459,12 @@
else
conn->removeutc = FALSE;
}
+ if (!strcmp(prop, "disablestrtbl")) {
+ if (!strcmp(data, "yes"))
+ conn->disablestrtbl = TRUE;
+ else
+ conn->disablestrtbl = FALSE;
+ }
}
}
fclose(f);
@@ -487,6 +493,7 @@
if (conn->otherphonebookdb)
fprintf(f, "otherphonebookdb = %s\n", conn->otherphonebookdb);
fprintf(f, "removeutc = %s\n", conn->removeutc?"yes":"no");
+ fprintf(f, "disablestrtbl = %s\n", conn->disablestrtbl?"yes":"no");
fclose(f);
}
g_free(filename);
--- multisync-0.82.orig/plugins/syncml_plugin/src/syncml_plugin.h
+++ multisync-0.82/plugins/syncml_plugin/src/syncml_plugin.h
@@ -31,7 +31,8 @@
char* othercalendardb;
char* otherphonebookdb;
gboolean removeutc; // Bug workaround
-
+ gboolean disablestrtbl; // Bug workaround
+
syncml_state *state;
syncml_devinfo *devinfo; // Devinfo from the other device
GList *changelist; // Storing of the change list until the sync engine
--- multisync-0.82.orig/plugins/syncml_plugin/syncml_plugin.glade2
+++ multisync-0.82/plugins/syncml_plugin/syncml_plugin.glade2
@@ -13,6 +13,11 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<signal name="delete_event" handler="on_syncml_optwin_delete_event"/>
<child>
@@ -847,6 +852,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked"
handler="syncml_devinfobutton_clicked"/>
<child>
@@ -856,6 +862,10 @@
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox4">
@@ -998,8 +1008,8 @@
<child>
<widget class="GtkTable" id="table5">
<property name="visible">True</property>
- <property name="n_rows">1</property>
- <property name="n_columns">2</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">1</property>
<property name="homogeneous">False</property>
<property name="row_spacing">3</property>
<property name="column_spacing">3</property>
@@ -1012,18 +1022,42 @@
<property name="label" translatable="yes">Interpret
UTC as local time (Symbian Devices)</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">2</property>
+ <property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="disablestrtbl">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">If this
option is enabled, times from the other end will be interpreted as being local
time even if they are stated to be in UTC. This is a common bug among some
Symbian devices such as SE P800/P900.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Disable
string tables</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1096,6 +1130,7 @@
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="syncml_cancelbutton_clicked"/>
</widget>
</child>
@@ -1108,6 +1143,7 @@
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="syncml_okbutton_clicked"/>
</widget>
</child>
