diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-06-12 02:38:00 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-06-12 02:38:00 +0800 |
| commit | e3e33f6f0bdc6b7fd02b7f0266bb891cb0a85752 (patch) | |
| tree | fd8d0a476312c7f900034242fb3858b141cdec8e | |
| parent | 7d4569259e0582598d979491721371aa49e41ead (diff) | |
| download | gsoc2013-evolution-e3e33f6f0bdc6b7fd02b7f0266bb891cb0a85752.tar.gz gsoc2013-evolution-e3e33f6f0bdc6b7fd02b7f0266bb891cb0a85752.tar.zst gsoc2013-evolution-e3e33f6f0bdc6b7fd02b7f0266bb891cb0a85752.zip | |
Don't destroy the offline_toggle_pixmap: the offline_toggle 0wnz it.
* 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
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 1dc690863f..bb769a4075 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -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 diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 71584f6f3a..29c75fb287 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -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; |