diff options
| author | Jason Leach <jleach@ximian.com> | 2001-06-09 02:00:37 +0800 |
|---|---|---|
| committer | Jacob Leach <jleach@src.gnome.org> | 2001-06-09 02:00:37 +0800 |
| commit | 216d52cd439642b64f0ea789ed68591a7a278c5a (patch) | |
| tree | 94bc42289746b9c85346dc0b8d9524afb04d45e9 | |
| parent | 1921719e0f7a06942ee70f5e1c3472f16c0645c5 (diff) | |
| download | gsoc2013-evolution-216d52cd439642b64f0ea789ed68591a7a278c5a.tar gsoc2013-evolution-216d52cd439642b64f0ea789ed68591a7a278c5a.tar.gz gsoc2013-evolution-216d52cd439642b64f0ea789ed68591a7a278c5a.tar.bz2 gsoc2013-evolution-216d52cd439642b64f0ea789ed68591a7a278c5a.tar.lz gsoc2013-evolution-216d52cd439642b64f0ea789ed68591a7a278c5a.tar.xz gsoc2013-evolution-216d52cd439642b64f0ea789ed68591a7a278c5a.tar.zst gsoc2013-evolution-216d52cd439642b64f0ea789ed68591a7a278c5a.zip | |
Fix splash setup to keep it from giving two Gtk-CRITICAL assertions when
2001-06-08 Jason Leach <jleach@ximian.com>
* e-shell.c (e_shell_construct): Fix splash setup to keep it from
giving two Gtk-CRITICAL assertions when you do --no-splash.
svn path=/trunk/; revision=10158
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/e-shell.c | 23 |
2 files changed, 14 insertions, 14 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 9520a98d01..20682ec34b 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2001-06-08 Jason Leach <jleach@ximian.com> + + * e-shell.c (e_shell_construct): Fix splash setup to keep it from + giving two Gtk-CRITICAL assertions when you do --no-splash. + 2001-06-06 Jon Trowbridge <trow@ximian.com> * evolution-storage.c (impl_Storage_async_create_folder): Changed diff --git a/shell/e-shell.c b/shell/e-shell.c index e931da6377..405770aeb1 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -727,11 +727,11 @@ init (EShell *shell) * Return value: %FALSE if the shell cannot be registered; %TRUE otherwise. **/ gboolean -e_shell_construct (EShell *shell, +e_shell_construct (EShell *shell, GNOME_Evolution_Shell corba_object, - const char *iid, - const char *local_directory, - gboolean show_splash) + const char *iid, + const char *local_directory, + gboolean show_splash) { GtkWidget *splash; EShellPrivate *priv; @@ -748,14 +748,9 @@ e_shell_construct (EShell *shell, if (register_shell (shell, iid) != OAF_REG_SUCCESS) return FALSE; - if (! show_splash) { - splash = NULL; - } else { + if (show_splash) { splash = e_splash_new (); gtk_widget_show (splash); - - /* Keep our own reference */ - gtk_object_ref (GTK_OBJECT (splash)); } while (gtk_events_pending ()) @@ -772,7 +767,7 @@ e_shell_construct (EShell *shell, if (! setup_corba_storages (shell)) return FALSE; - if (splash != NULL) + if (show_splash) setup_components (shell, E_SPLASH (splash)); else setup_components (shell, NULL); @@ -797,8 +792,8 @@ e_shell_construct (EShell *shell, g_free (shortcut_path); - gtk_widget_unref (splash); - gtk_widget_destroy (splash); + if (show_splash) + gtk_widget_destroy (splash); return TRUE; } @@ -814,7 +809,7 @@ e_shell_construct (EShell *shell, **/ EShell * e_shell_new (const char *local_directory, - gboolean show_splash) + gboolean show_splash) { EShell *new; EShellPrivate *priv; |