aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--importers/ChangeLog8
-rw-r--r--importers/elm-importer.c18
-rw-r--r--importers/evolution-gnomecard-importer.c17
-rw-r--r--importers/netscape-importer.c21
-rw-r--r--importers/pine-importer.c29
5 files changed, 41 insertions, 52 deletions
diff --git a/importers/ChangeLog b/importers/ChangeLog
index dccaf278eb..8220a60611 100644
--- a/importers/ChangeLog
+++ b/importers/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-07 Iain Holmes <iain@ximian.com>
+
+ * pine-importer.c:
+ netscape-importer.c:
+ elm-importer.c:
+ evolution-gnomecard-importer.c (create_checkboxes_control): New control
+ layout.
+
2001-09-05 Kjartan Maraas <kmaraas@gnome.org>
* pine-importer.c: Fix a typo.
diff --git a/importers/elm-importer.c b/importers/elm-importer.c
index 27d3508ec0..530d5c7d80 100644
--- a/importers/elm-importer.c
+++ b/importers/elm-importer.c
@@ -520,26 +520,20 @@ checkbox_toggle_cb (GtkToggleButton *tb,
static BonoboControl *
create_checkboxes_control (ElmImporter *importer)
{
- GtkWidget *container, *vbox;
+ GtkWidget *hbox;
BonoboControl *control;
- container = gtk_frame_new (_("Import"));
- vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_set_border_width (GTK_CONTAINER (container), 2);
- gtk_container_add (GTK_CONTAINER (container), vbox);
+ hbox = gtk_vbox_new (FALSE, 2);
importer->mail = gtk_check_button_new_with_label (_("Mail"));
gtk_signal_connect (GTK_OBJECT (importer->mail), "toggled",
GTK_SIGNAL_FUNC (checkbox_toggle_cb),
&importer->do_mail);
- gtk_box_pack_start (GTK_BOX (vbox), importer->mail, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), importer->mail, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->mail),
- importer->do_mail);
-
- gtk_widget_show_all (container);
- control = bonobo_control_new (container);
+ gtk_widget_show_all (hbox);
+ control = bonobo_control_new (hbox);
return control;
}
@@ -580,7 +574,7 @@ factory_fn (BonoboGenericFactory *_factory,
importer = evolution_intelligent_importer_new (elm_can_import,
elm_create_structure,
- _("Elm mail"),
+ _("Elm"),
_(message), elm);
gtk_signal_connect (GTK_OBJECT (importer), "destroy",
GTK_SIGNAL_FUNC (elm_destroy_cb), elm);
diff --git a/importers/evolution-gnomecard-importer.c b/importers/evolution-gnomecard-importer.c
index 141bd0338e..9a558ad783 100644
--- a/importers/evolution-gnomecard-importer.c
+++ b/importers/evolution-gnomecard-importer.c
@@ -222,25 +222,22 @@ checkbox_toggle_cb (GtkToggleButton *tb,
static BonoboControl *
create_checkboxes_control (GnomeCardImporter *importer)
{
- GtkWidget *container, *vbox;
+ GtkWidget *label, *hbox;
BonoboControl *control;
- container = gtk_frame_new (_("Import"));
- vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_set_border_width (GTK_CONTAINER (container), 2);
- gtk_container_add (GTK_CONTAINER (container), vbox);
+ hbox = gtk_hbox_new (FALSE, 2);
+ label = gtk_label_new (_("GnomeCard:"));
importer->addresses = gtk_check_button_new_with_label (_("Addressbook"));
gtk_signal_connect (GTK_OBJECT (importer->addresses), "toggled",
GTK_SIGNAL_FUNC (checkbox_toggle_cb),
&importer->do_addresses);
- gtk_box_pack_start (GTK_BOX (vbox), importer->addresses, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->addresses),
- importer->do_addresses);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), importer->addresses, FALSE, FALSE, 0);
- gtk_widget_show_all (container);
- control = bonobo_control_new (container);
+ gtk_widget_show_all (hbox);
+ control = bonobo_control_new (hbox);
return control;
}
diff --git a/importers/netscape-importer.c b/importers/netscape-importer.c
index 7d1f0d25e7..eb420b146d 100644
--- a/importers/netscape-importer.c
+++ b/importers/netscape-importer.c
@@ -945,13 +945,10 @@ checkbox_toggle_cb (GtkToggleButton *tb,
static BonoboControl *
create_checkboxes_control (NetscapeImporter *importer)
{
- GtkWidget *container, *vbox;
+ GtkWidget *hbox;
BonoboControl *control;
- container = gtk_frame_new (_("Import"));
- vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_set_border_width (GTK_CONTAINER (container), 2);
- gtk_container_add (GTK_CONTAINER (container), vbox);
+ hbox = gtk_vbox_new (FALSE, 2);
importer->mail = gtk_check_button_new_with_label (_("Mail"));
gtk_signal_connect (GTK_OBJECT (importer->mail), "toggled",
@@ -963,15 +960,11 @@ create_checkboxes_control (NetscapeImporter *importer)
GTK_SIGNAL_FUNC (checkbox_toggle_cb),
&importer->do_settings);
- gtk_box_pack_start (GTK_BOX (vbox), importer->mail, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), importer->settings, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->mail),
- importer->do_mail);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->settings),
- importer->do_settings);
+ gtk_box_pack_start (GTK_BOX (hbox), importer->mail, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), importer->settings, FALSE, FALSE, 0);
- gtk_widget_show_all (container);
- control = bonobo_control_new (container);
+ gtk_widget_show_all (hbox);
+ control = bonobo_control_new (hbox);
return control;
}
@@ -1011,7 +1004,7 @@ factory_fn (BonoboGenericFactory *_factory,
importer = evolution_intelligent_importer_new (netscape_can_import,
netscape_create_structure,
- "Netscape mail",
+ "Netscape",
_(message), netscape);
gtk_signal_connect (GTK_OBJECT (importer), "destroy",
GTK_SIGNAL_FUNC (netscape_destroy_cb), netscape);
diff --git a/importers/pine-importer.c b/importers/pine-importer.c
index 9d9794046b..e0b870377f 100644
--- a/importers/pine-importer.c
+++ b/importers/pine-importer.c
@@ -450,6 +450,10 @@ pine_import_file (PineImporter *importer,
return FALSE;
}
+ if (folder == TRUE) {
+ return FALSE;
+ }
+
importer->listener = evolution_importer_listener_new (importer_cb,
importer);
objref = bonobo_object_corba_objref (BONOBO_OBJECT (importer->listener));
@@ -506,6 +510,7 @@ import_next (PineImporter *importer)
if (importer->dir_list) {
char *folder;
+ gboolean another;
data = importer->dir_list->data;
@@ -535,7 +540,7 @@ import_next (PineImporter *importer)
g_free (data);
importer->dir_list = importer->dir_list->next;
}
-
+
}
/* Pine uses sent-mail and saved-mail whereas Evolution uses Sent and Drafts */
@@ -726,13 +731,10 @@ checkbox_toggle_cb (GtkToggleButton *tb,
static BonoboControl *
create_checkboxes_control (PineImporter *importer)
{
- GtkWidget *container, *vbox;
+ GtkWidget *hbox;
BonoboControl *control;
- container = gtk_frame_new (_("Import"));
- vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_set_border_width (GTK_CONTAINER (container), 2);
- gtk_container_add (GTK_CONTAINER (container), vbox);
+ hbox = gtk_hbox_new (FALSE, 2);
importer->mail = gtk_check_button_new_with_label (_("Mail"));
gtk_signal_connect (GTK_OBJECT (importer->mail), "toggled",
@@ -744,16 +746,11 @@ create_checkboxes_control (PineImporter *importer)
GTK_SIGNAL_FUNC (checkbox_toggle_cb),
&importer->do_address);
- gtk_box_pack_start (GTK_BOX (vbox), importer->mail, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), importer->address, FALSE, FALSE, 0);
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->mail),
- importer->do_mail);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (importer->address),
- importer->do_address);
+ gtk_box_pack_start (GTK_BOX (hbox), importer->mail, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), importer->address, FALSE, FALSE, 0);
- gtk_widget_show_all (container);
- control = bonobo_control_new (container);
+ gtk_widget_show_all (hbox);
+ control = bonobo_control_new (hbox);
return control;
}
@@ -793,7 +790,7 @@ factory_fn (BonoboGenericFactory *_factory,
importer = evolution_intelligent_importer_new (pine_can_import,
pine_create_structure,
- _("Pine mail"),
+ _("Pine"),
_(message), pine);
gtk_signal_connect (GTK_OBJECT (importer), "destroy",
GTK_SIGNAL_FUNC (pine_destroy_cb), pine);
generated by cgit (git 2.34.1) at 2024-12-24 03:20:46 +0800