Skip to content

Commit

Permalink
[eel] remove eel_gdk_pixbuf_list_ref()
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Jasmine Hassan committed Nov 16, 2012
1 parent 639c913 commit 48cc04d
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 18 deletions.
12 changes: 0 additions & 12 deletions eel/eel-gdk-pixbuf-extensions.c
Expand Up @@ -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)
{
Expand Down
4 changes: 0 additions & 4 deletions eel/eel-gdk-pixbuf-extensions.h
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions libcaja-private/caja-icon-canvas-item.c
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 48cc04d

Please sign in to comment.