diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 12 | ||||
| -rw-r--r-- | shell/e-setup.c | 5 | ||||
| -rw-r--r-- | shell/e-shell-view-menu.c | 3 | ||||
| -rw-r--r-- | shell/e-shell.c | 4 | ||||
| -rw-r--r-- | shell/importer/intelligent.c | 4 |
5 files changed, 25 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 8c77ae36f1..9de97b9b80 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,17 @@ 2001-06-23 Ettore Perazzoli <ettore@ximian.com> + * e-shell.c (e_shell_construct): Set `splash' to NULL when + @show_splash is false, so the compiler doesn't complain. + + * e-shell-view-menu.c: #include <gtk/gtkmain.h>. + + * e-setup.c: #include <unistd.h>. + + * importer/intelligent.c: #include <gtk/gtkhbox.h> and + <gtk/gtkdrawingarea.h>. + +2001-06-23 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view.c: New member `menu_hint_label' in `EShellViewPrivate'. (init): Init to NULL. diff --git a/shell/e-setup.c b/shell/e-setup.c index a1698be510..f70b7b00ff 100644 --- a/shell/e-setup.c +++ b/shell/e-setup.c @@ -30,8 +30,9 @@ #include <sys/stat.h> #include <sys/types.h> #include <dirent.h> -#include <stdio.h> /* rename() */ -#include <string.h> /* strlen() */ +#include <stdio.h> +#include <string.h> +#include <unistd.h> #include <gtk/gtklabel.h> #include <libgnome/gnome-defs.h> diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 09ea066bcf..5f314ade50 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -28,7 +28,10 @@ #include <config.h> #include <glib.h> + #include <gtk/gtksignal.h> +#include <gtk/gtkmain.h> + #include <libgnome/gnome-defs.h> #include <libgnome/gnome-exec.h> #include <libgnome/gnome-i18n.h> diff --git a/shell/e-shell.c b/shell/e-shell.c index 01392b0025..de38dbcdfc 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -776,7 +776,9 @@ e_shell_construct (EShell *shell, if (register_shell (shell, iid) != OAF_REG_SUCCESS) return FALSE; - if (show_splash) { + if (! show_splash) { + splash = NULL; + } else { splash = e_splash_new (); gtk_widget_show (splash); } diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index be9863e8d7..260b62ea77 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -27,8 +27,12 @@ #endif #include "intelligent.h" + #include <glib.h> + +#include <gtk/gtkdrawingarea.h> #include <gtk/gtkbox.h> +#include <gtk/gtkhbox.h> #include <gtk/gtkcheckbutton.h> #include <gtk/gtklabel.h> #include <gtk/gtkmain.h> |