From: Jim Evins Date: Tue, 10 Sep 2002 01:28:44 +0000 (+0000) Subject: Added 16x16 menu sized images for remainder of stock icons. X-Git-Tag: glabels-2_3_0~779 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=beb3e848d55c256418165cc1ed175577f9a78330;p=glabels Added 16x16 menu sized images for remainder of stock icons. Now uses g_free() instead of g_object_unref() on GtkIconSource -- it does not appear to be a GObject. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@105 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels2/src/stock.c b/glabels2/src/stock.c index 15c81ab3..c333780f 100644 --- a/glabels2/src/stock.c +++ b/glabels2/src/stock.c @@ -74,13 +74,13 @@ gl_stock_init (void) gtk_icon_factory_add_default (factory); add_icons (factory, GL_STOCK_ARROW, stock_arrow_24, stock_arrow_16); - add_icons (factory, GL_STOCK_TEXT, stock_text_24, NULL); - add_icons (factory, GL_STOCK_LINE, stock_line_24, NULL); - add_icons (factory, GL_STOCK_BOX, stock_box_24, NULL); - add_icons (factory, GL_STOCK_ELLIPSE, stock_ellipse_24, NULL); - add_icons (factory, GL_STOCK_IMAGE, stock_image_24, NULL); - add_icons (factory, GL_STOCK_BARCODE, stock_barcode_24, NULL); - add_icons (factory, GL_STOCK_MERGE, stock_merge_24, NULL); + add_icons (factory, GL_STOCK_TEXT, stock_text_24, stock_text_16); + add_icons (factory, GL_STOCK_LINE, stock_line_24, stock_line_16); + add_icons (factory, GL_STOCK_BOX, stock_box_24, stock_box_16); + add_icons (factory, GL_STOCK_ELLIPSE, stock_ellipse_24, stock_ellipse_16); + add_icons (factory, GL_STOCK_IMAGE, stock_image_24, stock_image_16); + add_icons (factory, GL_STOCK_BARCODE, stock_barcode_24, stock_barcode_16); + add_icons (factory, GL_STOCK_MERGE, stock_merge_24, stock_merge_16); g_object_unref (G_OBJECT(factory)); } @@ -112,7 +112,7 @@ static add_icons (GtkIconFactory *factory, gtk_icon_source_set_size_wildcarded (icon_source, FALSE); gtk_icon_source_set_size (icon_source, GTK_ICON_SIZE_MENU); gtk_icon_set_add_source (icon_set, icon_source); - g_object_unref (G_OBJECT(icon_source)); + g_free (icon_source); } /* Now associate icon set with stock id */