diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2000-09-21 23:51:19 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2000-09-21 23:51:19 +0000 |
| commit | 1e2203ebe50bc6ba15d7a3750490af2048eac699 (patch) | |
| tree | 696923b3f7cb48a8e17441e7c241ed4a4c6f3011 /components/image-viewer | |
| parent | 81952cfbc769cacc05270760e09c33746f7962ed (diff) | |
| download | nautilus-1e2203ebe50bc6ba15d7a3750490af2048eac699.tar.gz | |
Fixed bug 2090, Sidebar panel shrinks when back from text or image view to
2000-09-21 Gene Z. Ragan <gzr@eazel.com>
Fixed bug 2090, Sidebar panel shrinks when back from text
or image view to directory view.
* src/nautilus-sidebar.c: (make_button_box),
(nautilus_sidebar_update_buttons):
Fixed logic where button centering was being shown
at the wrong time, messing up spacing of sidebar panels.
* components/image-viewer/nautilus-image-view.c: (redraw_view),
(configure_size), (view_factory_common):
Fixed cases where image data might be NULL.
Diffstat (limited to 'components/image-viewer')
| -rw-r--r-- | components/image-viewer/nautilus-image-view.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/components/image-viewer/nautilus-image-view.c b/components/image-viewer/nautilus-image-view.c index 76bb96e29..0040451fb 100644 --- a/components/image-viewer/nautilus-image-view.c +++ b/components/image-viewer/nautilus-image-view.c @@ -199,7 +199,9 @@ redraw_view (view_data_t *view_data, GdkRectangle *rect) { GdkPixbuf *buf = get_pixbuf (view_data); - g_return_if_fail (buf != NULL); + if (buf == NULL) { + return; + } /* * Don't actually render unless our size has been allocated, @@ -216,8 +218,9 @@ configure_size (view_data_t *view_data, GdkRectangle *rect) { GdkPixbuf *buf = get_pixbuf (view_data); - g_return_if_fail (buf != NULL); - g_return_if_fail (view_data != NULL); + if (buf == NULL) { + return; + } /* * Don't configure the size if it hasn't gotten allocated, to @@ -379,6 +382,7 @@ destroy_view (BonoboView *view, view_data_t *view_data) g_free (view_data); } +#if 0 static void zoomable_zoom_in_callback (BonoboView *view, view_data_t *view_data) { @@ -398,6 +402,7 @@ static void zoomable_zoom_to_fit_callback (BonoboView *view, view_data_t *view_data) { } +#endif static int drawing_area_exposed (GtkWidget *widget, GdkEventExpose *event, view_data_t *view_data) @@ -538,6 +543,7 @@ view_factory_common (BonoboEmbeddable *bonobo_object, gtk_signal_connect (GTK_OBJECT (view), "destroy", GTK_SIGNAL_FUNC (destroy_view), view_data); +#if 0 gtk_signal_connect (GTK_OBJECT (view), "zoom_in", zoomable_zoom_in_callback, @@ -554,6 +560,7 @@ view_factory_common (BonoboEmbeddable *bonobo_object, "zoom_to_fit", zoomable_zoom_to_fit_callback, view_data); +#endif running_objects++; |