diff options
| author | Alex Larsson <alexl@redhat.com> | 2001-09-04 15:37:11 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-09-04 15:37:11 +0000 |
| commit | c113f3a2d1a3b3669c82167e0a32f496257fcb35 (patch) | |
| tree | 584dc3243a6034905f116e3e61c301933c649f3f /src/nautilus-complex-search-bar.c | |
| parent | 7426a6f728612a1239e634bbe85623ee8ef535c8 (diff) | |
| download | nautilus-c113f3a2d1a3b3669c82167e0a32f496257fcb35.tar.gz | |
Merge some stuff from the redhat-outstanding-patches branch
2001-09-03 Alex Larsson <alexl@redhat.com>
Merge some stuff from the redhat-outstanding-patches branch
* components/mozilla/nautilus-mozilla-embed-extensions.cpp
(mozilla_get_document_title): add this from Galeon
* components/mozilla/nautilus-mozilla-embed-extensions.cpp
(mozilla_unicode_to_locale): copy code from Galeon to use Mozilla
conversion features to convert unicode to locale encoding
* components/mozilla/nautilus-mozilla-content-view.c
(mozilla_title_changed_callback): set title in locale encoding
* libnautilus-private/nautilus-directory-metafile.c
(get_metafile): print error and exit if we fail to open the
metafile factory; somewhat cleaner than segfaulting.
* libnautilus-private/nautilus-file.c:
Cache user information to avoid many getpwuid calls etc.
* src/nautilus-complex-search-bar.c (load_find_them_pixmap_widget):
Don't leak pixmap and mask.
* libnautilus-private/nautilus-icon-container.c (lay_down_icons_tblr):
64bit clean. Use sizeof (int *), not sizeof (int).
* Makefile.am, nautilus-help.desktop.in: Add a help icon that uses
Nautilus
* components/help/help-method.c (help_name_to_local_path):
handle ghelp:toc to go to the default page gnome-help-browser used
to go to. kind of a lame hack, but so is this whole vfs module ;-)
Diffstat (limited to 'src/nautilus-complex-search-bar.c')
| -rw-r--r-- | src/nautilus-complex-search-bar.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nautilus-complex-search-bar.c b/src/nautilus-complex-search-bar.c index 7cbda7baf..229319681 100644 --- a/src/nautilus-complex-search-bar.c +++ b/src/nautilus-complex-search-bar.c @@ -453,12 +453,18 @@ load_find_them_pixmap_widget (void) GdkPixbuf *pixbuf; GdkPixmap *pixmap; GdkBitmap *mask; + GtkWidget *widget; pixbuf = gdk_pixbuf_new_from_file (NAUTILUS_PIXMAPDIR "/search.png"); if (pixbuf != NULL) { gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD); gdk_pixbuf_unref (pixbuf); - return gtk_pixmap_new (pixmap, mask); + widget = gtk_pixmap_new (pixmap, mask); + + gdk_pixmap_unref (pixmap); + gdk_pixmap_unref (mask); + + return widget; } else { return NULL; } |