Commit 72c9c08f authored by Johannes Schmid's avatar Johannes Schmid Committed by Johannes Schmid

Do not ref/unref icon theme as GTK+ docs stricly say you should not do

2007-09-24  Johannes Schmid <jhs@gnome.org>

	* gdl/gdl-icons.c:
	Do not ref/unref icon theme as GTK+ docs stricly say you should not do that!
	
	* configure.in:
	Disable deprecated flags completely until #457562 is fixed

	* MAINTAINERS: stick to GNOME convention to allow co

svn path=/trunk/; revision=389
parent ca06a158
2007-09-24 Johannes Schmid <jhs@gnome.org>
* gdl/gdl-icons.c:
Do not ref/unref icon theme as GTK+ docs stricly say you should not do that!
* configure.in:
Disable deprecated flags completely until #457562 is fixed
* MAINTAINERS: stick to GNOME convention to allow commit
=== gdl 0.7.7 ===
2007-08-14 Naba Kumar <naba@gnome.org>
......
Current Maintainers
Anjuta Team <anjuta-devel@lists.sf.net
Naba Kumar <naba@gnome.org>
Former Maintainers
Gustavo Girldez <gustavo.giraldez@gmx.net>
Dave Camp <dave@ximian.com>
Jeroen Zwartepoorte <jeroen@xs4all.nl>
Naba Kumar
E-Mail: naba@gnome.org
Userid: naba
......@@ -107,11 +107,11 @@ fi
AM_CONDITIONAL(HAVE_GNOME, [test x$gnome = xyes])
if test x$MAINT = x; then
DEPRECATED_FLAGS="-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED"
AC_SUBST(DEPRECATED_FLAGS)
fi
# Do not set deprecated flags as long as #457562 is not fixed
#if test x$MAINT = x; then
# DEPRECATED_FLAGS="-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED"
# AC_SUBST(DEPRECATED_FLAGS)
#fi
AC_MSG_CHECKING([for native Win32])
case "$host" in
......
......@@ -750,8 +750,8 @@ gdl_dock_item_map (GtkWidget *widget)
g_return_if_fail (widget != NULL);
g_return_if_fail (GDL_IS_DOCK_ITEM (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
//GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
item = GDL_DOCK_ITEM (widget);
gdk_window_show (widget->window);
......@@ -765,6 +765,8 @@ gdl_dock_item_map (GtkWidget *widget)
&& GTK_WIDGET_VISIBLE (item->_priv->grip)
&& !GTK_WIDGET_MAPPED (item->_priv->grip))
gtk_widget_map (item->_priv->grip);
GTK_WIDGET_CLASS (parent_class)->map (widget);
}
static void
......@@ -775,7 +777,7 @@ gdl_dock_item_unmap (GtkWidget *widget)
g_return_if_fail (widget != NULL);
g_return_if_fail (GDL_IS_DOCK_ITEM (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
//GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
item = GDL_DOCK_ITEM (widget);
......@@ -783,6 +785,8 @@ gdl_dock_item_unmap (GtkWidget *widget)
if (item->_priv->grip)
gtk_widget_unmap (item->_priv->grip);
GTK_WIDGET_CLASS (parent_class)->unmap (widget);
}
static void
......
......@@ -214,7 +214,8 @@ gdl_dock_layout_dispose (GObject *object)
layout->_priv->items_model = NULL;
layout->_priv->layouts_model = NULL;
}
xmlFreeDoc(layout->_priv->doc);
g_free (layout->_priv);
layout->_priv = NULL;
}
......
......@@ -107,7 +107,8 @@ gdl_icons_dispose (GObject *object)
GdlIconsPrivate *priv = GDL_ICONS_GET_PRIVATE (object);
if (priv->icon_theme) {
g_object_unref (priv->icon_theme);
/* Don't do that - look a GTK+ docs */
/* g_object_unref (priv->icon_theme); */
priv->icon_theme = NULL;
}
......@@ -145,7 +146,8 @@ gdl_icons_instance_init (GdlIcons *icons)
priv->icon_theme = gtk_icon_theme_get_default ();
/* gtk_icon_theme_get_default() does not ref the returned object */
g_object_ref (priv->icon_theme);
/* but API docs state the you should NOT ref it */
/* g_object_ref (priv->icon_theme);*/
g_signal_connect_object (G_OBJECT (priv->icon_theme), "changed",
G_CALLBACK (theme_changed_cb), icons, 0);
priv->icons = g_hash_table_new_full (g_str_hash, g_str_equal,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment