aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-08-18 03:44:17 +0800
committerIain Holmes <iain@src.gnome.org>2001-08-18 03:44:17 +0800
commitd5ea07e5bebd33b4189115284bc48b71f0eb57b2 (patch)
tree9924e56fe9480ea98873e1141de158a47e442b72 /shell
parent7473860c9fc3aa301cbb51da28928e63e74117b1 (diff)
downloadgsoc2013-evolution-d5ea07e5bebd33b4189115284bc48b71f0eb57b2.tar.gz
gsoc2013-evolution-d5ea07e5bebd33b4189115284bc48b71f0eb57b2.tar.zst
gsoc2013-evolution-d5ea07e5bebd33b4189115284bc48b71f0eb57b2.zip
Compile fixes
svn path=/trunk/; revision=12172
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-folder-selection-dialog.c4
-rw-r--r--shell/e-shell-startup-wizard.c6
-rw-r--r--shell/e-shell.c1
3 files changed, 8 insertions, 3 deletions
diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c
index 213dbd5557..e436880dbd 100644
--- a/shell/e-shell-folder-selection-dialog.c
+++ b/shell/e-shell-folder-selection-dialog.c
@@ -116,6 +116,10 @@ folder_creation_dialog_result_cb (EShell *shell,
dialog = E_SHELL_FOLDER_SELECTION_DIALOG (data);
priv = dialog->priv;
+ if (priv == NULL) {
+ return;
+ }
+
if (result == E_SHELL_FOLDER_CREATION_DIALOG_RESULT_SUCCESS)
e_storage_set_view_set_current_folder (E_STORAGE_SET_VIEW (priv->storage_set_view),
path);
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 72a10c7c19..18b7b59287 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -318,6 +318,8 @@ finish_func (GnomeDruidPage *page,
data->cancel = FALSE;
gtk_widget_destroy (data->dialog);
gtk_main_quit ();
+
+ return TRUE;
}
static void
@@ -480,9 +482,9 @@ make_timezone_page (SWData *data)
page->page = glade_xml_get_widget (data->wizard, "timezone-page");
g_return_val_if_fail (page->page != NULL, NULL);
- page->vbox = GNOME_DRUID_PAGE_STANDARD (page->page)->vbox;
+ page->vbox = GTK_WIDGET (GNOME_DRUID_PAGE_STANDARD (page->page)->vbox);
- page->etd = e_timezone_dialog_new ();
+ page->etd = GTK_OBJECT (e_timezone_dialog_new ());
e_timezone_dialog_reparent (page->etd, page->vbox);
return page;
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 704147ecac..357236ba7f 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -979,7 +979,6 @@ e_shell_construct (EShell *shell,
e_shortcuts_add_default_group (priv->shortcuts);
g_free (shortcut_path);
-
return E_SHELL_CONSTRUCT_RESULT_OK;
}