diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-10 11:22:51 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:49:21 +0200 |
| commit | 48cc04df5933644ade234ce16ac8a6ee817bb867 (patch) | |
| tree | a3fb36dabf4d33d7cfa80ea79324d33c2a02cb60 | |
| parent | 639c9137b77557f38946d6dc174772554343da47 (diff) | |
| download | caja-48cc04df5933644ade234ce16ac8a6ee817bb867.tar.bz2 caja-48cc04df5933644ade234ce16ac8a6ee817bb867.tar.xz | |
[eel] remove eel_gdk_pixbuf_list_ref()
But unlike upstream commit below, not removing include eel-art-extensions.h
from eel-gdk-pixbuf-extensions.h, as we still have functions in the latter
using eel_irect_* (from eel-art-extensions), which are still used by the
eel-debug-drawing we kept around.
http://git.gnome.org/browse/nautilus/commit/?id=7dee3226ad6b3aa1c782cc3d2969e32c5eeae3f3
| -rw-r--r-- | eel/eel-gdk-pixbuf-extensions.c | 12 | ||||
| -rw-r--r-- | eel/eel-gdk-pixbuf-extensions.h | 4 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.c | 3 |
3 files changed, 1 insertions, 18 deletions
diff --git a/eel/eel-gdk-pixbuf-extensions.c b/eel/eel-gdk-pixbuf-extensions.c index 040855b8..c913cb10 100644 --- a/eel/eel-gdk-pixbuf-extensions.c +++ b/eel/eel-gdk-pixbuf-extensions.c @@ -54,18 +54,6 @@ struct EelPixbufLoadHandle char buffer[LOAD_BUFFER_SIZE]; }; -/** - * eel_gdk_pixbuf_list_ref - * @pixbuf_list: A list of GdkPixbuf objects. - * - * Refs all the pixbufs. - **/ -void -eel_gdk_pixbuf_list_ref (GList *pixbuf_list) -{ - g_list_foreach (pixbuf_list, (GFunc) g_object_ref, NULL); -} - GdkPixbuf * eel_gdk_pixbuf_load (const char *uri) { diff --git a/eel/eel-gdk-pixbuf-extensions.h b/eel/eel-gdk-pixbuf-extensions.h index 07a7a0ac..382cd6cd 100644 --- a/eel/eel-gdk-pixbuf-extensions.h +++ b/eel/eel-gdk-pixbuf-extensions.h @@ -41,10 +41,6 @@ typedef void (* EelPixbufLoadCallback) (GError *error, GdkPixbuf *pixbuf, gpointer callback_data); -/* Convenience functions for lists of GdkPixbuf objects. */ -void eel_gdk_pixbuf_list_ref (GList *pixbuf_list); - - /* Loading a GdkPixbuf with a URI. */ GdkPixbuf * eel_gdk_pixbuf_load (const char *uri); GdkPixbuf * eel_gdk_pixbuf_load_from_stream (GInputStream *stream); diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index bcec72a5..f36f2ccf 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -35,7 +35,6 @@ #include <eel/eel-gdk-extensions.h> #include <eel/eel-gdk-pixbuf-extensions.h> #include <eel/eel-glib-extensions.h> -#include <eel/eel-mate-extensions.h> #include <eel/eel-graphic-effects.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-string.h> @@ -763,7 +762,7 @@ caja_icon_canvas_item_set_emblems (CajaIconCanvasItem *item, } /* Take in the new list of emblems. */ - eel_gdk_pixbuf_list_ref (emblem_pixbufs); + eel_g_object_list_ref (emblem_pixbufs); g_list_foreach(item->details->emblem_pixbufs, (GFunc) g_object_unref, NULL); g_list_free(item->details->emblem_pixbufs); item->details->emblem_pixbufs = g_list_copy (emblem_pixbufs); |