Commit ff7a0922 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer
Browse files

changed two private guint that used to hold signal handler IDs to two

2005-11-24  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktoolbar.h (struct _GtkToolbar): changed two private guint
	that used to hold signal handler IDs to two guint of padding.

	* gtk/gtktoolbar.c (struct _GtkToolbarPrivate): added them as
	gulong here.

	(gtk_toolbar_screen_changed): changed accordingly.
parent fbb2e3f4
2005-11-24 Michael Natterer <mitch@imendio.com>
* gtk/gtktoolbar.h (struct _GtkToolbar): changed two private guint
that used to hold signal handler IDs to two guint of padding.
* gtk/gtktoolbar.c (struct _GtkToolbarPrivate): added them as
gulong here.
(gtk_toolbar_screen_changed): changed accordingly.
Wed Nov 23 18:55:47 2005 Tim Janik <timj@imendio.com>
* gtk/gtkobject.[hc]: deprecated floating/sink API and implemented it
......
2005-11-24 Michael Natterer <mitch@imendio.com>
* gtk/gtktoolbar.h (struct _GtkToolbar): changed two private guint
that used to hold signal handler IDs to two guint of padding.
* gtk/gtktoolbar.c (struct _GtkToolbarPrivate): added them as
gulong here.
(gtk_toolbar_screen_changed): changed accordingly.
Wed Nov 23 18:55:47 2005 Tim Janik <timj@imendio.com>
* gtk/gtkobject.[hc]: deprecated floating/sink API and implemented it
......
......@@ -142,7 +142,10 @@ struct _GtkToolbarPrivate
gint max_homogeneous_pixels;
GTimer * timer;
gulong style_set_connection;
gulong icon_size_connection;
guint show_arrow : 1;
guint need_sync : 1;
guint is_sliding : 1;
......@@ -2035,20 +2038,20 @@ gtk_toolbar_screen_changed (GtkWidget *widget,
if (old_settings)
{
g_signal_handler_disconnect (old_settings, toolbar->style_set_connection);
g_signal_handler_disconnect (old_settings, toolbar->icon_size_connection);
g_signal_handler_disconnect (old_settings, priv->style_set_connection);
g_signal_handler_disconnect (old_settings, priv->icon_size_connection);
g_object_unref (old_settings);
}
if (settings)
{
toolbar->style_set_connection =
priv->style_set_connection =
g_signal_connect_swapped (settings,
"notify::gtk-toolbar-style",
G_CALLBACK (style_change_notify),
toolbar);
toolbar->icon_size_connection =
priv->icon_size_connection =
g_signal_connect_swapped (settings,
"notify::gtk-toolbar-icon-size",
G_CALLBACK (icon_size_change_notify),
......
......@@ -104,10 +104,10 @@ struct _GtkToolbar
/*< private >*/
gint button_maxw; /* maximum width of homogeneous children */
gint button_maxh; /* maximum height of homogeneous children */
guint style_set_connection;
guint icon_size_connection;
guint _gtk_reserved1;
guint _gtk_reserved2;
guint style_set : 1;
guint icon_size_set : 1;
};
......
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