From 765d89de748d29e99e0babf08091985133f9c377 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Tue, 6 Nov 2012 18:07:07 +0200 Subject: [emblem-sidebar] Don't include eel-gtk-macros, minor cleanup --- src/caja-emblem-sidebar.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/caja-emblem-sidebar.c') diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c index 7c188a7d..ea21bec9 100644 --- a/src/caja-emblem-sidebar.c +++ b/src/caja-emblem-sidebar.c @@ -32,7 +32,6 @@ #include "caja-emblem-sidebar.h" #include -#include #include #include #include @@ -67,12 +66,10 @@ struct CajaEmblemSidebarDetails #define STANDARD_EMBLEM_HEIGHT 52 #define EMBLEM_LABEL_SPACING 2 -static void caja_emblem_sidebar_iface_init (CajaSidebarIface *iface); -static void caja_emblem_sidebar_finalize (GObject *object); static void caja_emblem_sidebar_populate (CajaEmblemSidebar *emblem_sidebar); static void caja_emblem_sidebar_refresh (CajaEmblemSidebar *emblem_sidebar); static void caja_emblem_sidebar_iface_init (CajaSidebarIface *iface); -static void sidebar_provider_iface_init (CajaSidebarProviderIface *iface); +static void sidebar_provider_iface_init (CajaSidebarProviderIface *iface); static GType caja_emblem_sidebar_provider_get_type (void); static const GtkTargetEntry drag_types[] = @@ -113,8 +110,6 @@ typedef struct } CajaEmblemSidebarProviderClass; - - G_DEFINE_TYPE_WITH_CODE (CajaEmblemSidebar, caja_emblem_sidebar, GTK_TYPE_VBOX, G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR, caja_emblem_sidebar_iface_init)); -- cgit v1.2.1 From 7a42b9b076d6b831c89bd0b9e996368c1c95aef3 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 18 Oct 2012 10:30:31 +0200 Subject: [all] use g_list_free() and g_strcmp0 instead of eel functions Was: general: use g_list_free_full() instead of eel functions http://git.gnome.org/browse/nautilus/commit/?id=5e669515fd7f760382e6b7aa1449734a35a2d7f4 . Instead of g_list_free_full(), we use g_list_foreach and g_list_free() to avoid unnecessary glib dependency bump to 2.28 --- src/caja-emblem-sidebar.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/caja-emblem-sidebar.c') diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c index ea21bec9..1de86f9b 100644 --- a/src/caja-emblem-sidebar.c +++ b/src/caja-emblem-sidebar.c @@ -32,8 +32,6 @@ #include "caja-emblem-sidebar.h" #include -#include -#include #include #include #include @@ -1008,7 +1006,8 @@ caja_emblem_sidebar_populate (CajaEmblemSidebar *emblem_sidebar) widgets = g_list_prepend (widgets, emblem_widget); } - eel_g_list_free_deep (icons); + g_list_foreach(icons, (GFunc) g_free, NULL); + g_list_free(icons); /* sort the emblems by display name */ widgets = g_list_sort (widgets, emblem_widget_sort_func); -- cgit v1.2.1