From 730547e0bbc716793c4cd6d677e9d547b45c0775 Mon Sep 17 00:00:00 2001 From: Jehan Date: Thu, 2 Jun 2016 19:56:47 +0200 Subject: [PATCH] libgimpwidgets: fix commit e6ba618. - Missing comma; - headers from libgimpwidgets can't be included in app/core. So icon macros can't be used there. --- app/core/gimppalette.c | 2 +- libgimpwidgets/gimpicons.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c index 57dea793f4..c886df6b74 100644 --- a/app/core/gimppalette.c +++ b/app/core/gimppalette.c @@ -94,7 +94,7 @@ gimp_palette_class_init (GimpPaletteClass *klass) gimp_object_class->get_memsize = gimp_palette_get_memsize; - viewable_class->default_icon_name = GIMP_STOCK_COLOR_PALETTE; + viewable_class->default_icon_name = "gimp-color-palette"; viewable_class->get_preview_size = gimp_palette_get_preview_size; viewable_class->get_popup_size = gimp_palette_get_popup_size; viewable_class->get_new_preview = gimp_palette_get_new_preview; diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c index 13a5c9e434..d6ce2fa3ce 100644 --- a/libgimpwidgets/gimpicons.c +++ b/libgimpwidgets/gimpicons.c @@ -120,7 +120,7 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_COLOR_TRIANGLE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_CMYK, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_WATER, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_COLOR_PALETTE NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_COLOR_PALETTE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_PICK_FROM_SCREEN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CHAR_PICKER, NULL, 0, 0, LIBGIMP_DOMAIN },