callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't destroy the offline_toggle_pixmap: the offline_toggle 0wnz it.

Browse Source 
* e-shell-view.c (destroy): Don't destroy the
	offline_toggle_pixmap: the offline_toggle 0wnz it.
	(update_for_current_uri): Check priv->uri isn't NULL before
	strcmp()ing it.

svn path=/trunk/; revision=10187
This commit is contained in:
Dan Winship
2001-06-11 18:38:00 +00:00
parent 7d4569259e
commit e3e33f6f0b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/ChangeLog
View File

@ -1,3 +1,10 @@
2001-06-11 Dan Winship <danw@ximian.com>
* e-shell-view.c (destroy): Don't destroy the
offline_toggle_pixmap: the offline_toggle 0wnz it.
(update_for_current_uri): Check priv->uri isn't NULL before
strcmp()ing it.
2001-06-11 Jason Leach <jleach@ximian.com>
* evolution-storage.c (impl_Storage_async_create_folder): Fixed

3
shell/e-shell-view.c
View File

@ -840,7 +840,6 @@ destroy (GtkObject *object)
g_hash_table_destroy (priv->uri_to_control);
gtk_widget_destroy (priv->offline_toggle);
gtk_widget_destroy (priv->offline_toggle_pixmap);
gtk_widget_destroy (priv->progress_bar);
bonobo_object_unref (BONOBO_OBJECT (priv->ui_component));
@ -1379,7 +1378,7 @@ update_for_current_uri (EShellView *shell_view)
path = get_storage_set_path_from_uri (priv->uri);
if (strcmp (priv->uri, "evolution:/My Evolution") == 0) {
if (priv->uri != NULL && strcmp (priv->uri, "evolution:/My Evolution") == 0) {
/* Special case for My Evolution */
folder_name = g_strdup (_("My Evolution"));
is_my_evolution = TRUE;