aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-05-26 12:23:41 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-05-26 12:23:41 +0800
commitca6276f9e5e5813b6954e2869667458c3b1d9f10 (patch)
treedb61be26e191a7befd9909aa0f8af446b442e0fa /shell
parent1689385939c40e1a88aa9733e3234950f75ec0ba (diff)
downloadgsoc2013-evolution-ca6276f9e5e5813b6954e2869667458c3b1d9f10.tar.gz
gsoc2013-evolution-ca6276f9e5e5813b6954e2869667458c3b1d9f10.tar.zst
gsoc2013-evolution-ca6276f9e5e5813b6954e2869667458c3b1d9f10.zip
set exception if not implemented.
2004-05-26 Not Zed <NotZed@Ximian.com> * importer/evolution-importer.c (impl_GNOME_Evolution_Importer_createControl): set exception if not implemented. * e-shell-importer.c (importer_file_page_new): set the entry to activate default, and fixed the _Filename and _Forward shortcut clash. #58081. (prepare_dest_page): pack the widget without expand/fill. svn path=/trunk/; revision=26088
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog11
-rw-r--r--shell/e-shell-importer.c11
-rw-r--r--shell/importer/evolution-importer.c2
3 files changed, 19 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 361b1a30d8..50bce39db2 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2004-05-26 Not Zed <NotZed@Ximian.com>
+
+ * importer/evolution-importer.c
+ (impl_GNOME_Evolution_Importer_createControl): set exception if not
+ implemented.
+
+ * e-shell-importer.c (importer_file_page_new): set the entry to
+ activate default, and fixed the _Filename and _Forward shortcut
+ clash. #58081.
+ (prepare_dest_page): pack the widget without expand/fill.
+
2004-05-21 Jeffrey Stedfast <fejj@novell.com>
* evolution-shell-component-utils.c (e_activation_failure_dialog):
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index b7511e5f16..c83693a53b 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -581,7 +581,7 @@ static ImportDialogFilePage *
importer_file_page_new (ImportData *data)
{
ImportDialogFilePage *page;
- GtkWidget *table, *label;
+ GtkWidget *table, *label, *entry;
int row = 0;
page = g_new0 (ImportDialogFilePage, 1);
@@ -595,14 +595,15 @@ importer_file_page_new (ImportData *data)
gtk_container_set_border_width (GTK_CONTAINER (table), 8);
gtk_box_pack_start (GTK_BOX (page->vbox), table, TRUE, TRUE, 0);
- label = gtk_label_new_with_mnemonic (_("_Filename:"));
+ label = gtk_label_new_with_mnemonic (_("F_ilename:"));
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
page->filename = gnome_file_entry_new ("Evolution_Importer_FileName", _("Select a file"));
- g_signal_connect (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (page->filename)), "changed",
- G_CALLBACK (filename_changed), data);
+ entry = gnome_file_entry_gtk_entry((GnomeFileEntry *)page->filename);
+ g_signal_connect (entry, "changed", G_CALLBACK (filename_changed), data);
+ gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
gtk_table_attach (GTK_TABLE (table), page->filename, 1, 2,
row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
@@ -1071,7 +1072,7 @@ prepare_dest_page (GnomeDruidPage *page,
if (data->control)
gtk_container_remove (GTK_CONTAINER (data->destpage->vbox), data->control);
data->control = evolution_importer_client_create_control (data->client);
- gtk_container_add (GTK_CONTAINER (data->destpage->vbox), data->control);
+ gtk_box_pack_start((GtkBox *)data->destpage->vbox, data->control, FALSE, FALSE, 0);
gtk_widget_show_all (data->destpage->vbox);
return FALSE;
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index 430e1b2da8..03ff54fea6 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -64,6 +64,8 @@ impl_GNOME_Evolution_Importer_createControl (PortableServer_Servant servant,
if (priv->create_control_fn != NULL)
(priv->create_control_fn) (importer, control, priv->closure);
+ else
+ CORBA_exception_set_system (ev, ex_CORBA_NO_IMPLEMENT, CORBA_COMPLETED_NO);
}
static CORBA_boolean