diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-16 05:08:48 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-16 05:08:48 -0800 |
| commit | dc66bc40724191f0068869773576dc4edf042c6f (patch) | |
| tree | 74b9684feea188736b21f2c829f29befaaf2e9da /src/caja-emblem-sidebar.c | |
| parent | 935e1fed604f48e68d125d205c890a59f46f8f21 (diff) | |
| parent | 1466df20591105550738a1d0784a623af9909abf (diff) | |
| download | caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2 caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz | |
Merge pull request #42 from jasmineaura/develop
Bring Caja up to speed, stage1
Diffstat (limited to 'src/caja-emblem-sidebar.c')
| -rw-r--r-- | src/caja-emblem-sidebar.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c index 7c188a7d..1de86f9b 100644 --- a/src/caja-emblem-sidebar.c +++ b/src/caja-emblem-sidebar.c @@ -32,9 +32,6 @@ #include "caja-emblem-sidebar.h" #include <stdio.h> -#include <eel/eel-gtk-macros.h> -#include <eel/eel-glib-extensions.h> -#include <eel/eel-string.h> #include <eel/eel-wrap-table.h> #include <eel/eel-labeled-image.h> #include <eel/eel-graphic-effects.h> @@ -67,12 +64,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 +108,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)); @@ -1013,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); |