aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-10-08 00:19:18 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-10-08 00:19:18 +0800
commitfdb774412ddd69ce24173f2c9ba2e84ca07601b0 (patch)
tree681ab46b10a0ad74752257c8f8785428c783c176
parentbda9596690687aab710bcb9e2ff89abd3b098618 (diff)
downloadgsoc2013-evolution-fdb774412ddd69ce24173f2c9ba2e84ca07601b0.tar.gz
gsoc2013-evolution-fdb774412ddd69ce24173f2c9ba2e84ca07601b0.tar.zst
gsoc2013-evolution-fdb774412ddd69ce24173f2c9ba2e84ca07601b0.zip
Change the selection mode to GTK_SELECTION_BROWSE so there is always a
* e-shell-importer.c (choose_importer_from_list): Change the selection mode to GTK_SELECTION_BROWSE so there is always a selection. The code here doesn't handle a NULL selection. [#31690] * e-shell-importer.c (import_cb): Only delay half a second (instead of 5 seconds) when getting EVOLUTION_IMPORTER_NOT_READY or EVOLUTION_IMPORTER_BUSY. * importer/evolution-importer-listener.c (impl_GNOME_Evolution_ImporterListener_notifyResult): Removed debugging message. svn path=/trunk/; revision=18332
-rw-r--r--shell/ChangeLog15
-rw-r--r--shell/e-shell-importer.c16
-rw-r--r--shell/importer/evolution-importer-listener.c1
3 files changed, 18 insertions, 14 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 70909f09ff..191c41699b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,18 @@
+2002-10-07 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-shell-importer.c (choose_importer_from_list): Change the
+ selection mode to GTK_SELECTION_BROWSE so there is always a
+ selection. The code here doesn't handle a NULL selection.
+ [#31690]
+
+ * e-shell-importer.c (import_cb): Only delay half a second
+ (instead of 5 seconds) when getting EVOLUTION_IMPORTER_NOT_READY
+ or EVOLUTION_IMPORTER_BUSY.
+
+ * importer/evolution-importer-listener.c
+ (impl_GNOME_Evolution_ImporterListener_notifyResult): Removed
+ debugging message.
+
2002-10-04 Chris Toshok <toshok@ximian.com>
* e-shell-folder-selection-dialog.c (delete_event_cb): new
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 5fc9adaedb..af16efb532 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -237,24 +237,13 @@ import_cb (EvolutionImporterListener *listener,
IN;
if (icd->stop != TRUE) {
if (result == EVOLUTION_IMPORTER_NOT_READY) {
- /* Importer isn't ready yet.
- Wait 5 seconds and try again. */
-
- label = g_strdup_printf (_("Importing %s\nImporter not ready."
- "\nWaiting 5 seconds to retry."),
- icd->filename);
- gtk_label_set_text (GTK_LABEL (icd->contents), label);
- g_free (label);
- while (gtk_events_pending ())
- gtk_main_iteration ();
-
- gtk_timeout_add (5000, importer_timeout_fn, data);
+ gtk_timeout_add (500, importer_timeout_fn, data);
OUT;
return;
}
if (result == EVOLUTION_IMPORTER_BUSY) {
- gtk_timeout_add (5000, importer_timeout_fn, data);
+ gtk_timeout_add (500, importer_timeout_fn, data);
OUT;
return;
}
@@ -381,6 +370,7 @@ choose_importer_from_list (GList *importer_list)
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), clist,
TRUE, TRUE, 0);
+ gtk_clist_set_selection_mode (GTK_CLIST (clist), GTK_SELECTION_BROWSE);
gtk_widget_show (clist);
switch (gnome_dialog_run (GNOME_DIALOG (dialog))) {
diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
index ea20431c9c..f67b963cbb 100644
--- a/shell/importer/evolution-importer-listener.c
+++ b/shell/importer/evolution-importer-listener.c
@@ -108,7 +108,6 @@ impl_GNOME_Evolution_ImporterListener_notifyResult (PortableServer_Servant serva
listener = evolution_importer_listener_from_servant (servant);
priv = listener->priv;
- g_print ("Notified\n");
out_result = corba_result_to_evolution (result);
if (priv->callback) {
(priv->callback) (listener, out_result, more_items,