aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-10-13 06:12:21 +0800
committerIain Holmes <iain@src.gnome.org>2001-10-13 06:12:21 +0800
commit74d8c78022be3b37edb80876e8a21aed3323a0af (patch)
treea9a084f11ab0919959d66d96f94d5baeb521bec6
parent1bd22eb65b2d1fa1cb8a589871337290c1cb258f (diff)
downloadgsoc2013-evolution-74d8c78022be3b37edb80876e8a21aed3323a0af.tar
gsoc2013-evolution-74d8c78022be3b37edb80876e8a21aed3323a0af.tar.gz
gsoc2013-evolution-74d8c78022be3b37edb80876e8a21aed3323a0af.tar.bz2
gsoc2013-evolution-74d8c78022be3b37edb80876e8a21aed3323a0af.tar.lz
gsoc2013-evolution-74d8c78022be3b37edb80876e8a21aed3323a0af.tar.xz
gsoc2013-evolution-74d8c78022be3b37edb80876e8a21aed3323a0af.tar.zst
gsoc2013-evolution-74d8c78022be3b37edb80876e8a21aed3323a0af.zip
Fix strings and the importer window not drawing correctly
svn path=/trunk/; revision=13636
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/e-shell-importer.c6
-rw-r--r--shell/e-shell-startup-wizard.c21
3 files changed, 24 insertions, 13 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ab6872f2d6..fa7f5702b6 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,13 @@
+2001-10-12 Iain Holmes <iain@ximian.com>
+
+ * e-shell-importer.c (prepare_intelligent_page): Flush the gdk
+ functions so that the window will be shown.
+
+ * e-shell-startup-wizard.c (make_mail_dialog_pages): Fix some
+ strings.
+ (prepare_importer_page): Flush GDK functions so that the window
+ is shown.
+
2001-10-12 Ettore Perazzoli <ettore@ximian.com>
[Fix #7643, Starting new view doesn't honor "view" settings.]
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index eeda75024f..2e94553053 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -718,8 +718,14 @@ prepare_intelligent_page (GnomeDruid *druid,
data->importerpage->prepared = TRUE;
dialog = gnome_message_box_new (_("Please wait...\nScanning for existing setups"), GNOME_MESSAGE_BOX_INFO, NULL);
+ e_make_widget_backing_stored (dialog);
+
gtk_window_set_title (GTK_WINDOW (dialog), _("Starting Intelligent Importers"));
gtk_widget_show_all (dialog);
+
+ gtk_widget_queue_draw (dialog);
+ gdk_flush ();
+
while (gtk_events_pending ()) {
gtk_main_iteration ();
}
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index ed42cf8bd6..79b3e2964b 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -48,6 +48,7 @@
#include "importer/GNOME_Evolution_Importer.h"
#include "e-timezone-dialog/e-timezone-dialog.h"
+#include "e-util/e-gtk-utils.h"
#include <evolution-wizard.h>
#include "Evolution.h"
@@ -156,7 +157,7 @@ make_mail_dialog_pages (SWData *data)
data->mailer = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Mail_Wizard", 0, NULL, &ev);
if (BONOBO_EX (&ev)) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
- _("Could not start the Evolution Mailer Wizard interface\n%s"), CORBA_exception_id (&ev));
+ _("(%s:%d)Could not start the Evolution Mailer Assistant interface\n%s"), __FUNCTION__, __LINE__, CORBA_exception_id (&ev));
g_warning ("Could not start mailer (%s)", CORBA_exception_id (&ev));
CORBA_exception_free (&ev);
return;
@@ -165,7 +166,7 @@ make_mail_dialog_pages (SWData *data)
CORBA_exception_free (&ev);
if (data->mailer == CORBA_OBJECT_NIL) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
- _("Cannot initialize the Evolution Mailer Wizard interface"));
+ _("(%s:%d)Could not start the Evolution Mailer Assistant interface\n%s"), __FUNCTION__, __LINE__, "");
return;
}
@@ -554,15 +555,6 @@ get_intelligent_importers (void)
return iids_ret;
}
-static void
-dialog_mapped (GtkWidget *w,
- gpointer data)
-{
- while (gtk_events_pending ()) {
- gtk_main_iteration ();
- }
-}
-
static gboolean
prepare_importer_page (GnomeDruidPage *page,
@@ -580,10 +572,13 @@ prepare_importer_page (GnomeDruidPage *page,
}
dialog = gnome_message_box_new (_("Please wait...\nScanning for existing setups"), GNOME_MESSAGE_BOX_INFO, NULL);
- gtk_signal_connect (GTK_OBJECT (dialog), "map",
- GTK_SIGNAL_FUNC (dialog_mapped), NULL);
+ e_make_widget_backing_stored (dialog);
+
gtk_window_set_title (GTK_WINDOW (dialog), _("Starting Intelligent Importers"));
gtk_widget_show_all (dialog);
+ gtk_widget_queue_draw (dialog);
+ gdk_flush ();
+
while (gtk_events_pending ()) {
gtk_main_iteration ();
}