X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtknumerableicon.c;h=e46547174a6e0b722ad00fd532d38af7ec6b02b7;hb=563eb60666d9f72c38d7542b0ab37841e6aac488;hp=2522102b10cbb3fe27af4e513d20fe7f838dd81d;hpb=27ee3fec96c1fa4b2f3d5d4094a999fae478e298;p=~andy%2Fgtk
diff --git a/gtk/gtknumerableicon.c b/gtk/gtknumerableicon.c
index 2522102b1..e46547174 100644
--- a/gtk/gtknumerableicon.c
+++ b/gtk/gtknumerableicon.c
@@ -14,9 +14,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*
* Authors: Cosimo Cecchi
*/
@@ -43,10 +41,12 @@
#include
#include "gtknumerableicon.h"
+#include "gtknumerableiconprivate.h"
#include "gtkicontheme.h"
#include "gtkintl.h"
#include "gtkwidget.h"
+#include "gtkwidgetpath.h"
#include "gtkwindow.h"
#include
@@ -55,11 +55,12 @@
struct _GtkNumerableIconPrivate {
gint count;
+ gint icon_size;
+
gchar *label;
GIcon *background_icon;
gchar *background_icon_name;
- gint icon_size;
GdkRGBA *background;
GdkRGBA *foreground;
@@ -214,7 +215,7 @@ draw_from_gicon (GtkNumerableIcon *self)
return NULL;
pixbuf = gtk_icon_info_load_icon (info, NULL);
- gtk_icon_info_free (info);
+ g_object_unref (info);
if (pixbuf == NULL)
return NULL;
@@ -1008,7 +1009,7 @@ gtk_numerable_icon_get_background_icon_name (GtkNumerableIcon *self)
*
* Creates a new unthemed #GtkNumerableIcon.
*
- * Returns: a new #GIcon
+ * Returns: (transfer full): a new #GIcon
*
* Since: 3.0
*/
@@ -1031,7 +1032,7 @@ gtk_numerable_icon_new (GIcon *base_icon)
* to the passed #GtkStyleContext. This is a convenience constructor
* that calls gtk_numerable_icon_set_style_context() internally.
*
- * Returns: a new #GIcon
+ * Returns: (transfer full): a new #GIcon
*
* Since: 3.0
*/