diff options
| author | Jonathan Blandford <jrb@gnome.org> | 2004-03-08 09:56:34 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2004-03-08 09:56:34 +0000 |
| commit | 59938d927cd87c47d8e77446f0efe5cd9627b6a8 (patch) | |
| tree | eb083397195ba1380b8632e18d001d27bd5dfdc9 /tests/testfilechooser.c | |
| parent | 683eff48dcce30355e76ef5d61fc8da5592acd07 (diff) | |
| download | gtk+-59938d927cd87c47d8e77446f0efe5cd9627b6a8.tar.gz | |
new function to consolidate creating the path_bar.
Mon Mar 8 04:50:12 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (create_path_bar): new function to
consolidate creating the path_bar.
(gtk_file_chooser_default_set_current_folder): no longer need to
pass in the filesystem.
* gtk/gtkpathbar.h: Removed unused set_pixbuf functions in favor
of just setting the filesystem.
* gtk/gtkpathbar.c (gtk_path_bar_finalize): Free root path and
home_dir.
(get_button_image): Add images to path_bar.
(update_button_appearance): use images
(make_directory_button): Clasify buttons based upon location.
(_gtk_path_bar_set_path): no longer need a file-system. Also, add
rerooting, #135845, #135914
* tests/testfilechooser.c: Fix reused error handling.
Diffstat (limited to 'tests/testfilechooser.c')
| -rw-r--r-- | tests/testfilechooser.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c index 6c76f70bcc..8d27cbd0cb 100644 --- a/tests/testfilechooser.c +++ b/tests/testfilechooser.c @@ -216,6 +216,7 @@ my_new_from_file_at_size (const char *filename, fclose (f); + g_assert (*error == NULL); if (!gdk_pixbuf_loader_close (loader, error)) { g_object_unref (G_OBJECT (loader)); return NULL; @@ -225,6 +226,11 @@ my_new_from_file_at_size (const char *filename, if (!pixbuf) { g_object_unref (G_OBJECT (loader)); + + /* did the loader set an error? */ + if (*error != NULL) + return NULL; + g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, |